From 0f636651553127c3631862eed7166606b7524057 Mon Sep 17 00:00:00 2001 From: A-j-K Date: Fri, 14 Jul 2023 19:37:35 +0100 Subject: [PATCH 1/5] Add Skywatcher SynScan HC and Pro App alignment stars --- plugins/NavStars/src/NavStars.cpp | 24 +++++++++++++++++++++ plugins/NavStars/src/NavStars.hpp | 3 ++- plugins/NavStars/src/gui/NavStarsWindow.cpp | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/plugins/NavStars/src/NavStars.cpp b/plugins/NavStars/src/NavStars.cpp index 394a71acf592b..e22435eea4211 100644 --- a/plugins/NavStars/src/NavStars.cpp +++ b/plugins/NavStars/src/NavStars.cpp @@ -450,6 +450,10 @@ QString NavStars::getCurrentNavigationalStarsSetDescription() const txt = q_("These 37 stars were used by the Apollo space program to navigate to the Moon from 1969-1972, Apollo 11 through Apollo 17."); break; } + case Skywatcher: + { + txt = q_("This list contains all the alignment stars for the Skywatch SynScan hand controller and SynScan Pro App."); + } } return txt; @@ -660,6 +664,26 @@ void NavStars::populateNavigationalStarsSet(void) << 102098 << 107315 << 113368; break; } + case Skywatcher: + { + // Skywatcher SynScan Hand Held Controller and SynScan Pro mobile and desktop App + // Sources: https://www.iceinspace.com.au/63-501-0-0-1-0.html + // https://www.iceinspace.com.au/download.php?10d72300ac5d3762f0529eb11977fb68 + starNumbers << 13847 << 33579 << 95947 << 67301 << 17702 << 21421 << 105199 + << 15863 << 50583 << 14576 << 31681 << 62956 << 62956 << 9640 + << 25428 << 26311 << 26727 << 81266 << 46390 << 76267 << 677 + << 97649 << 35904 << 2081 << 80763 << 69673 << 25985 << 23015 + << 25336 << 27989 << 28380 << 24608 << 746 << 36850 << 102098 + << 57632 << 3419 << 78401 << 54061 << 107315 << 87833 << 81377 + << 113368 << 78159 << 102488 << 36188 << 9884 << 23015 << 72105 + << 90185 << 72607 << 4427 << 113963 << 32246 << 59774 << 28360 + << 14135 << 53910 << 59316 << 25930 << 10826 << 5447 << 15863 + << 65378 << 30324 << 39429 << 92855 << 58001 << 11767 << 37826 + << 37279 << 28437 << 84345 << 47908 << 86032 << 49669 << 24436 + << 109074 << 27366 << 86228 << 113881 << 8903 << 85927 << 3179 + << 32349 << 65474 << 97278 << 77070 << 91262 << 34444 << 79593; + break; + } } setNavStarsMarks(currentState); diff --git a/plugins/NavStars/src/NavStars.hpp b/plugins/NavStars/src/NavStars.hpp index 02e1067611b14..f2ebf14526660 100644 --- a/plugins/NavStars/src/NavStars.hpp +++ b/plugins/NavStars/src/NavStars.hpp @@ -86,7 +86,8 @@ class NavStars : public StelModule MeadeAS494, //!< Meade Autostar #494 Alignment Stars MeadeAS497, //!< Meade Autostar #497 Alignment Stars Celestron, //!< Celestron Alignment Star List - Apollo //!< Apollo Alignment Star List + Apollo, //!< Apollo Alignment Star List + Skywatcher //!< Skywatcher Synscan Hand Controller and SynScan Pro App }; Q_ENUM(NavigationalStarsSet) diff --git a/plugins/NavStars/src/gui/NavStarsWindow.cpp b/plugins/NavStars/src/gui/NavStarsWindow.cpp index 946aa30a39267..0ad955bf22a99 100644 --- a/plugins/NavStars/src/gui/NavStarsWindow.cpp +++ b/plugins/NavStars/src/gui/NavStarsWindow.cpp @@ -251,6 +251,7 @@ void NavStarsWindow::populateNavigationalStarsSets() nsSets->addItem("Celestron", "Celestron"); // TRANSLATORS: Part of full phrase: Apollo space program set of navigational stars nsSets->addItem(q_("Apollo space program"), "Apollo"); + nsSets->addItem("Skywatcher", "Skywatcher"); //Restore the selection index = nsSets->findData(selectedNsSetId, Qt::UserRole, Qt::MatchCaseSensitive); From 136b7760e2b86323009b40da6d5f1b021267af26 Mon Sep 17 00:00:00 2001 From: A-j-K Date: Fri, 14 Jul 2023 22:19:56 +0100 Subject: [PATCH 2/5] Address feedback from gzotti. Reorder list, refactor inits --- plugins/NavStars/src/NavStars.cpp | 284 +++++++++++--------- plugins/NavStars/src/gui/NavStarsWindow.cpp | 7 +- 2 files changed, 159 insertions(+), 132 deletions(-) diff --git a/plugins/NavStars/src/NavStars.cpp b/plugins/NavStars/src/NavStars.cpp index e22435eea4211..91b014d20c53f 100644 --- a/plugins/NavStars/src/NavStars.cpp +++ b/plugins/NavStars/src/NavStars.cpp @@ -473,62 +473,68 @@ void NavStars::populateNavigationalStarsSet(void) case AngloAmerican: { // 57 "selected stars" from The Nautical Almanac. - starNumbers << 677 << 2081 << 3179 << 3419 << 7588 << 9884 << 13847 - << 14135 << 15863 << 21421 << 24436 << 24608 << 25336 << 25428 - << 26311 << 27989 << 30438 << 32349 << 33579 << 37279 << 37826 - << 41037 << 44816 << 45238 << 46390 << 49669 << 54061 << 57632 - << 59803 << 60718 << 61084 << 62956 << 65474 << 67301 << 68702 - << 68933 << 69673 << 71683 << 72622 << 72607 << 76267 << 80763 - << 82273 << 84012 << 85927 << 86032 << 87833 << 90185 << 91262 - << 92855 << 97649 << 100751 << 102098 << 107315 << 109268 << 113368 - << 113963; + starNumbers = { + 677, 2081, 3179, 3419, 7588, 9884, 13847, + 14135, 15863, 21421, 24436, 24608, 25336, 25428, + 26311, 27989, 30438, 32349, 33579, 37279, 37826, + 41037, 44816, 45238, 46390, 49669, 54061, 57632, + 59803, 60718, 61084, 62956, 65474, 67301, 68702, + 68933, 69673, 71683, 72622, 72607, 76267, 80763, + 82273, 84012, 85927, 86032, 87833, 90185, 91262, + 92855, 97649, 100751, 102098, 107315, 109268, 113368, + 113963 + }; break; } case French: { // 81 stars from French Nautical Almanac // Original French name: Ephémérides Nautiques - starNumbers << 677 << 746 << 1067 << 2081 << 3179 << 3419 << 4427 - << 5447 << 7588 << 9884 << 11767 << 14135 << 14576 << 15863 - << 21421 << 24436 << 24608 << 25336 << 25428 << 26311 << 26727 - << 27989 << 28360 << 30324 << 30438 << 31681 << 32349 << 33579 - << 34444 << 36850 << 37279 << 37826 << 39429 << 39953 << 41037 - << 42913 << 44816 << 45238 << 45556 << 46390 << 49669 << 53910 - << 54061 << 54872 << 57632 << 58001 << 59803 << 60718 << 61084 - << 61932 << 62434 << 62956 << 65378 << 65474 << 67301 << 68702 - << 68933 << 69673 << 71683 << 72607 << 76267 << 80763 << 82273 - << 82396 << 85927 << 86032 << 87833 << 90185 << 91262 << 92855 - << 97649 << 100453 << 100751 << 102098 << 105199 << 107315 << 109268 - << 112122 << 113368 << 113881 << 113963; + starNumbers = { + 677, 746, 1067, 2081, 3179, 3419, 4427, + 5447, 7588, 9884, 11767, 14135, 14576, 15863, + 21421, 24436, 24608, 25336, 25428, 26311, 26727, + 27989, 28360, 30324, 30438, 31681, 32349, 33579, + 34444, 36850, 37279, 37826, 39429, 39953, 41037, + 42913, 44816, 45238, 45556, 46390, 49669, 53910, + 54061, 54872, 57632, 58001, 59803, 60718, 61084, + 61932, 62434, 62956, 65378, 65474, 67301, 68702, + 68933, 69673, 71683, 72607, 76267, 80763, 82273, + 82396, 85927, 86032, 87833, 90185, 91262, 92855, + 97649, 100453, 100751, 102098, 105199, 107315, 109268, + 112122, 113368, 113881,113963 + }; break; } case Russian: { // 160 stars from Russian Nautical Almanac // Original Russian name: Морской астрономический ежегодник. - starNumbers << 677 << 746 << 1067 << 2021 << 2081 << 3179 << 3419 - << 4427 << 5447 << 6686 << 7588 << 8886 << 8903 << 9236 - << 9640 << 9884 << 13847 << 14135 << 14576 << 15863 << 17702 - << 18246 << 18532 << 21421 << 23015 << 23875 << 24436 << 24608 - << 25336 << 25428 << 25606 << 25930 << 25985 << 26241 << 26311 - << 26451 << 26634 << 26727 << 27913 << 27989 << 28360 << 28380 - << 30324 << 30438 << 31681 << 32349 << 32768 << 33579 << 33152 - << 34444 << 35264 << 35904 << 36188 << 36850 << 37279 << 37826 - << 39429 << 39757 << 39953 << 41037 << 42913 << 44816 << 45238 - << 45556 << 46390 << 46701 << 49669 << 50583 << 52419 << 52727 - << 53910 << 54061 << 54872 << 57632 << 58001 << 59196 << 59747 - << 59774 << 59803 << 60718 << 61084 << 61359 << 61585 << 61932 - << 61941 << 62434 << 62956 << 63121 << 63608 << 65109 << 65378 - << 65474 << 66657 << 67301 << 67927 << 68002 << 68702 << 68933 - << 69673 << 71075 << 71352 << 71681 << 71860 << 72105 << 72622 - << 72607 << 73273 << 74946 << 74785 << 76297 << 76267 << 77070 - << 78401 << 78820 << 79593 << 80331 << 80763 << 80816 << 81266 - << 81377 << 81693 << 82273 << 82396 << 83081 << 84012 << 85258 - << 85792 << 85670 << 85927 << 86032 << 86228 << 79540 << 86742 - << 87833 << 88635 << 89931 << 90185 << 90496 << 91262 << 95347 - << 93506 << 93747 << 94141 << 97165 << 97278 << 97649 << 100453 - << 100751 << 102098 << 102488 << 105199 << 107315 << 107556 << 109268 - << 110130 << 112122 << 113368 << 113881 << 113963 << 11767; + starNumbers = { + 677, 746, 1067, 2021, 2081, 3179, 3419, + 4427, 5447, 6686, 7588, 8886, 8903, 9236, + 9640, 9884, 13847, 14135, 14576, 15863, 17702, + 18246, 18532, 21421, 23015, 23875, 24436, 24608, + 25336, 25428, 25606, 25930, 25985, 26241, 26311, + 26451, 26634, 26727, 27913, 27989, 28360, 28380, + 30324, 30438, 31681, 32349, 32768, 33579, 33152, + 34444, 35264, 35904, 36188, 36850, 37279, 37826, + 39429, 39757, 39953, 41037, 42913, 44816, 45238, + 45556, 46390, 46701, 49669, 50583, 52419, 52727, + 53910, 54061, 54872, 57632, 58001, 59196, 59747, + 59774, 59803, 60718, 61084, 61359, 61585, 61932, + 61941, 62434, 62956, 63121, 63608, 65109, 65378, + 65474, 66657, 67301, 67927, 68002, 68702, 68933, + 69673, 71075, 71352, 71681, 71860, 72105, 72622, + 72607, 73273, 74946, 74785, 76297, 76267, 77070, + 78401, 78820, 79593, 80331, 80763, 80816, 81266, + 81377, 81693, 82273, 82396, 83081, 84012, 85258, + 85792, 85670, 85927, 86032, 86228, 79540, 86742, + 87833, 88635, 89931, 90185, 90496, 91262, 95347, + 93506, 93747, 94141, 97165, 97278, 97649, 100453, + 100751, 102098, 102488, 105199, 107315, 107556, 109268, + 110130, 112122, 113368, 113881, 113963, 11767 + }; break; } case German: @@ -536,35 +542,39 @@ void NavStars::populateNavigationalStarsSet(void) // 80 stars from German Nautical Almanac // Original German name: Nautisches Jahrbuch // The numbers are identical to the "Nautisches Jahrbuch" - starNumbers << 677 << 1067 << 2081 << 3179 << 3419 << 4427 - << 5447 << 7588 << 11767 << 9640 << 9884 << 14135 - << 14576 << 15863 << 17702 << 21421 << 24436 << 24608 - << 25336 << 25428 << 26311 << 26727 << 27366 << 27989 - << 28360 << 30324 << 30438 << 31681 << 32349 << 33579 - << 34444 << 36850 << 37279 << 37826 << 41037 << 44816 - << 45238 << 46390 << 49669 << 52419 << 54061 << 57632 - << 60718 << 61084 << 62434 << 62956 << 63608 << 65378 - << 65474 << 67301 << 68702 << 68933 << 69673 << 71683 - << 72105 << 72622 << 72607 << 74785 << 76267 << 77070 - << 80763 << 82273 << 82396 << 85927 << 86032 << 86228 - << 87833 << 90185 << 91262 << 92855 << 97649 << 100751 - << 102098 << 105199 << 107315 << 109268 << 112122 << 113368 - << 113881 << 113963; + starNumbers = { + 677, 1067, 2081, 3179, 3419, 4427, + 5447, 7588, 11767, 9640, 9884, 14135, + 14576, 15863, 17702, 21421, 24436, 24608, + 25336, 25428, 26311, 26727, 27366, 27989, + 28360, 30324, 30438, 31681, 32349, 33579, + 34444, 36850, 37279, 37826, 41037, 44816, + 45238, 46390, 49669, 52419, 54061, 57632, + 60718, 61084, 62434, 62956, 63608, 65378, + 65474, 67301, 68702, 68933, 69673, 71683, + 72105, 72622, 72607, 74785, 76267, 77070, + 80763, 82273, 82396, 85927, 86032, 86228, + 87833, 90185, 91262, 92855, 97649, 100751, + 102098, 105199, 107315, 109268, 112122, 113368, + 113881, 113963 + }; break; } case GeminiAPS: { // Gemini Alignment Star List // Source: Gemini Users Manual, Level 4, René Görlich et. al., April 2006 - starNumbers << 677 << 1067 << 3419 << 5447 << 7588 << 9884 - << 11767 << 14135 << 15863 << 18543 << 21421 << 24436 - << 24608 << 27989 << 30438 << 32349 << 36850 << 37279 - << 37826 << 46390 << 49669 << 54061 << 54872 << 57632 - << 59803 << 60718 << 63608 << 65378 << 65474 << 68702 - << 69673 << 71683 << 72603 << 77070 << 80763 << 80816 - << 85927 << 86032 << 90185 << 91262 << 92855 << 95947 - << 97649 << 102098 << 106278 << 107315 << 109074 << 113368 - << 113963; + starNumbers = { + 677, 1067, 3419, 5447, 7588, 9884, + 11767, 14135, 15863, 18543, 21421, 24436, + 24608, 27989, 30438, 32349, 36850, 37279, + 37826, 46390, 49669, 54061, 54872, 57632, + 59803, 60718, 63608, 65378, 65474, 68702, + 69673, 71683, 72603, 77070, 80763, 80816, + 85927, 86032, 90185, 91262, 92855, 95947, + 97649, 102098, 106278, 107315, 109074, 113368, + 113963 + }; break; } case MeadeLX200: @@ -575,12 +585,14 @@ void NavStars::populateNavigationalStarsSet(void) // 7" LX200 Maksutov-Cassegrain Telescope // 8", 10", and 12" LX200 Schmidt-Cassegrain Telescopes // HIP 28380 = Bogardus - starNumbers << 7588 << 60718 << 95947 << 67301 << 21421 << 26311 - << 46390 << 76267 << 97649 << 80763 << 69673 << 27989 - << 28380 << 30438 << 24608 << 36850 << 102098 << 57632 - << 3419 << 107315 << 113368 << 68702 << 9884 << 113963 - << 10826 << 11767 << 37826 << 37279 << 49669 << 24436 - << 32349 << 65474 << 91262; + starNumbers = { + 7588, 60718, 95947, 67301, 21421, 26311, + 46390, 76267, 97649, 80763, 69673, 27989, + 28380, 30438, 24608, 36850, 102098, 57632, + 3419, 107315, 113368, 68702, 9884, 113963, + 10826, 11767, 37826, 37279, 49669, 24436, + 32349, 65474, 91262 + }; break; } case MeadeETX: @@ -591,8 +603,10 @@ void NavStars::populateNavigationalStarsSet(void) // ETX-90EC Astro Telescope // ETX-105EC Astro Telescope // ETX-125EC Astro Telescope - starNumbers << 69673 << 49669 << 65474 << 91262 << 102098 << 97649 << 80763 - << 113963 << 113368 << 10826 << 24436 << 27989 << 32349 << 21421; + starNumbers = { + 69673, 49669, 65474, 91262, 102098, 97649, 80763, + 113963, 113368, 10826, 24436, 27989, 32349, 21421 + }; break; } case MeadeAS494: @@ -600,17 +614,19 @@ void NavStars::populateNavigationalStarsSet(void) // Meade Autostar #494 Alignment Stars // Source: // http://www.weasner.com/etx/autostar/as_494align_stars.html - starNumbers << 13847 << 7588 << 60718 << 33579 << 95947 << 65477 << 17702 - << 21421 << 105199 << 1067 << 50583 << 14576 << 31681 << 62956 - << 67301 << 9640 << 109268 << 25428 << 26311 << 26727 << 46390 - << 76267 << 677 << 98036 << 97649 << 2081 << 80763 << 69673 - << 25985 << 25336 << 27989 << 30438 << 24608 << 36850 << 63125 - << 102098 << 57632 << 3419 << 54061 << 107315 << 87833 << 113368 - << 68702 << 9884 << 72105 << 90185 << 72607 << 113963 << 59774 - << 13954 << 53910 << 25930 << 10826 << 5447 << 15863 << 65378 - << 25606 << 92855 << 58001 << 37826 << 37279 << 84345 << 86032 - << 49669 << 24436 << 109074 << 27366 << 113881 << 85927 << 3179 - << 32349 << 65474 << 97278 << 68756 << 77070 << 91262 << 63608; + starNumbers = { + 13847, 7588, 60718, 33579, 95947, 65477, 17702, + 21421, 105199, 1067, 50583, 14576, 31681, 62956, + 67301, 9640, 109268, 25428, 26311, 26727, 46390, + 76267, 677, 98036, 97649, 2081, 80763, 69673, + 25985, 25336, 27989, 30438, 24608, 36850, 63125, + 102098, 57632, 3419, 54061, 107315, 87833, 113368, + 68702, 9884, 72105, 90185, 72607, 113963, 59774, + 13954, 53910, 25930, 10826, 5447, 15863, 65378, + 25606, 92855, 58001, 37826, 37279, 84345, 86032, + 49669, 24436, 109074, 27366, 113881, 85927, 3179, + 32349, 65474, 97278, 68756, 77070, 91262, 63608 + }; break; } case MeadeAS497: @@ -618,36 +634,40 @@ void NavStars::populateNavigationalStarsSet(void) // Meade Autostar #497 Alignment Stars // Source: // http://www.weasner.com/etx/autostar/as_497align_stars.html - starNumbers << 13847 << 7588 << 60718 << 33579 << 95947 << 65477 << 17702 - << 21421 << 105199 << 1067 << 50583 << 14576 << 31681 << 62956 - << 67301 << 9640 << 109268 << 25428 << 26311 << 26727 << 46390 - << 76267 << 677 << 98036 << 97649 << 2081 << 80763 << 69673 - << 25985 << 25336 << 27989 << 30438 << 24608 << 36850 << 63125 - << 102098 << 57632 << 3419 << 54061 << 107315 << 87833 << 113368 - << 68702 << 9884 << 72105 << 90185 << 72607 << 113963 << 59774 - << 13954 << 53910 << 25930 << 10826 << 5447 << 15863 << 65378 - << 25606 << 92855 << 58001 << 11767 << 37826 << 37279 << 84345 - << 86032 << 49669 << 24436 << 109074 << 27366 << 113881 << 85927 - << 3179 << 32349 << 65474 << 97278 << 68756 << 77070 << 91262 - << 63608; + starNumbers = { + 13847, 7588, 60718, 33579, 95947, 65477, 17702, + 21421, 105199, 1067, 50583, 14576, 31681, 62956, + 67301, 9640, 109268, 25428, 26311, 26727, 46390, + 76267, 677, 98036, 97649, 2081, 80763, 69673, + 25985, 25336, 27989, 30438, 24608, 36850, 63125, + 102098, 57632, 3419, 54061, 107315, 87833, 113368, + 68702, 9884, 72105, 90185, 72607, 113963, 59774, + 13954, 53910, 25930, 10826, 5447, 15863, 65378, + 25606, 92855, 58001, 11767, 37826, 37279, 84345, + 86032, 49669, 24436, 109074, 27366, 113881, 85927, + 3179, 32349, 65474, 97278, 68756, 77070, 91262, + 63608 + }; break; } case Celestron: { // Celestron Alignment Star List // Source: https://www.celestron.com/blogs/knowledgebase/can-all-named-stars-listed-in-the-hand-control-be-used-for-alignment - starNumbers << 32349 << 30438 << 69673 << 91262 << 24608 << 24436 << 37279 - << 7588 << 27989 << 68702 << 97649 << 21421 << 65474 << 80763 - << 37826 << 113368 << 60718 << 62434 << 71683 << 102098 << 49669 - << 33579 << 25336 << 61084 << 85927 << 26311 << 25428 << 45238 - << 109268 << 15863 << 34444 << 39953 << 54061 << 62956 << 28360 - << 31681 << 41037 << 67301 << 82273 << 86228 << 90185 << 100751 - << 3419 << 9884 << 11767 << 30324 << 36850 << 46390 << 677 - << 5447 << 14576 << 26727 << 27366 << 57632 << 72607 << 68933 - << 86032 << 92855 << 3179 << 25930 << 44816 << 61932 << 76267 - << 87833 << 100453 << 746 << 9640 << 66811 << 80404 << 65378 - << 78401 << 2081 << 53910 << 58001 << 84012 << 105199 << 107315 - << 113881 << 4427 << 14135 << 35904 << 113963; + starNumbers = { + 32349, 30438, 69673, 91262, 24608, 24436, 37279, + 7588, 27989, 68702, 97649, 21421, 65474, 80763, + 37826, 113368, 60718, 62434, 71683, 102098, 49669, + 33579, 25336, 61084, 85927, 26311, 25428, 45238, + 109268, 15863, 34444, 39953, 54061, 62956, 28360, + 31681, 41037, 67301, 82273, 86228, 90185, 100751, + 3419, 9884, 11767, 30324, 36850, 46390, 677, + 5447, 14576, 26727, 27366, 57632, 72607, 68933, + 86032, 92855, 3179, 25930, 44816, 61932, 76267, + 87833, 100453, 746, 9640, 66811, 80404, 65378, + 78401, 2081, 53910, 58001, 84012, 105199, 107315, + 113881, 4427, 14135, 35904, 113963 + }; break; } case Apollo: @@ -655,13 +675,15 @@ void NavStars::populateNavigationalStarsSet(void) // Apollo Alignment Star List (37 stars) // Sources: https://history.nasa.gov/alsj/alsj-AOTNavStarsDetents.html // https://www.spaceartifactsarchive.com/2013/05/the-star-chart-of-apollo.html - starNumbers << 677 << 3419 << 4427 << 7588 << 11767 << 13847 << 13954 - << 0 << 0 << 15863 << 21421 << 24436 << 24608 << 30438 - << 32349 << 37279 << 39953 << 0 << 0 << 44127 << 46390 - << 49669 << 57632 << 59803 << 60718 << 65474 << 67301 << 0 - << 0 << 68933 << 69673 << 76267 << 80763 << 82273 << 86032 - << 91262 << 92855 << 0 << 0 << 97649 << 100345 << 100751 - << 102098 << 107315 << 113368; + starNumbers = { + 677, 3419, 4427, 7588, 11767, 13847, 13954, + 0, 0, 15863, 21421, 24436, 24608, 30438, + 32349, 37279, 39953, 0, 0, 44127, 46390, + 49669, 57632, 59803, 60718, 65474, 67301, 0, + 0, 68933, 69673, 76267, 80763, 82273, 86032, + 91262, 92855, 0, 0, 97649, 100345, 100751, + 102098, 107315, 113368 + }; break; } case Skywatcher: @@ -669,19 +691,21 @@ void NavStars::populateNavigationalStarsSet(void) // Skywatcher SynScan Hand Held Controller and SynScan Pro mobile and desktop App // Sources: https://www.iceinspace.com.au/63-501-0-0-1-0.html // https://www.iceinspace.com.au/download.php?10d72300ac5d3762f0529eb11977fb68 - starNumbers << 13847 << 33579 << 95947 << 67301 << 17702 << 21421 << 105199 - << 15863 << 50583 << 14576 << 31681 << 62956 << 62956 << 9640 - << 25428 << 26311 << 26727 << 81266 << 46390 << 76267 << 677 - << 97649 << 35904 << 2081 << 80763 << 69673 << 25985 << 23015 - << 25336 << 27989 << 28380 << 24608 << 746 << 36850 << 102098 - << 57632 << 3419 << 78401 << 54061 << 107315 << 87833 << 81377 - << 113368 << 78159 << 102488 << 36188 << 9884 << 23015 << 72105 - << 90185 << 72607 << 4427 << 113963 << 32246 << 59774 << 28360 - << 14135 << 53910 << 59316 << 25930 << 10826 << 5447 << 15863 - << 65378 << 30324 << 39429 << 92855 << 58001 << 11767 << 37826 - << 37279 << 28437 << 84345 << 47908 << 86032 << 49669 << 24436 - << 109074 << 27366 << 86228 << 113881 << 8903 << 85927 << 3179 - << 32349 << 65474 << 97278 << 77070 << 91262 << 34444 << 79593; + starNumbers = { + 13847, 33579, 95947, 67301, 17702, 21421, 105199, + 15863, 50583, 14576, 31681, 62956, 62956, 9640, + 25428, 26311, 26727, 81266, 46390, 76267, 677, + 97649, 35904, 2081, 80763, 69673, 25985, 23015, + 25336, 27989, 28380, 24608, 746, 36850, 102098, + 57632, 3419, 78401, 54061, 107315, 87833, 81377, + 113368, 78159, 102488, 36188, 9884, 23015, 72105, + 90185, 72607, 4427, 113963, 32246, 59774, 28360, + 14135, 53910, 59316, 25930, 10826, 5447, 15863, + 65378, 30324, 39429, 92855, 58001, 11767, 37826, + 37279, 28437, 84345, 47908, 86032, 49669, 24436, + 109074, 27366, 86228, 113881, 8903, 85927, 3179, + 32349, 65474, 97278, 77070, 91262, 34444, 79593 + }; break; } } diff --git a/plugins/NavStars/src/gui/NavStarsWindow.cpp b/plugins/NavStars/src/gui/NavStarsWindow.cpp index 0ad955bf22a99..e646c73441ee4 100644 --- a/plugins/NavStars/src/gui/NavStarsWindow.cpp +++ b/plugins/NavStars/src/gui/NavStarsWindow.cpp @@ -243,14 +243,17 @@ void NavStarsWindow::populateNavigationalStarsSets() nsSets->addItem(q_("Russian"), "Russian"); // TRANSLATORS: Part of full phrase: German set of navigational stars nsSets->addItem(q_("German"), "German"); + + // TRANSLATORS: Part of full phrase: Apollo space program set of navigational stars + nsSets->addItem(q_("Apollo space program"), "Apollo"); + + // Telescope alignment stars nsSets->addItem("Gemini APS", "GeminiAPS"); nsSets->addItem("Meade LX200", "MeadeLX200"); nsSets->addItem("Meade ETX", "MeadeETX"); nsSets->addItem("Meade Autostar #494", "MeadeAS494"); nsSets->addItem("Meade Autostar #497", "MeadeAS497"); nsSets->addItem("Celestron", "Celestron"); - // TRANSLATORS: Part of full phrase: Apollo space program set of navigational stars - nsSets->addItem(q_("Apollo space program"), "Apollo"); nsSets->addItem("Skywatcher", "Skywatcher"); //Restore the selection From 6a23bf0ee5dca988c98cedab2246f119fc148b9e Mon Sep 17 00:00:00 2001 From: A-j-K Date: Fri, 14 Jul 2023 22:34:28 +0100 Subject: [PATCH 3/5] Add missing case break --- plugins/NavStars/src/NavStars.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/NavStars/src/NavStars.cpp b/plugins/NavStars/src/NavStars.cpp index 91b014d20c53f..c295f59d6c1ca 100644 --- a/plugins/NavStars/src/NavStars.cpp +++ b/plugins/NavStars/src/NavStars.cpp @@ -453,6 +453,7 @@ QString NavStars::getCurrentNavigationalStarsSetDescription() const case Skywatcher: { txt = q_("This list contains all the alignment stars for the Skywatch SynScan hand controller and SynScan Pro App."); + break; } } From 03f53c0d6c33c650e7b996a0e9b3e45d2b5053b3 Mon Sep 17 00:00:00 2001 From: A-j-K Date: Fri, 14 Jul 2023 23:50:14 +0100 Subject: [PATCH 4/5] Clean up switch statement --- plugins/NavStars/src/NavStars.cpp | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/plugins/NavStars/src/NavStars.cpp b/plugins/NavStars/src/NavStars.cpp index c295f59d6c1ca..289faf3e3254b 100644 --- a/plugins/NavStars/src/NavStars.cpp +++ b/plugins/NavStars/src/NavStars.cpp @@ -391,70 +391,47 @@ QString NavStars::getCurrentNavigationalStarsSetDescription() const switch(getCurrentNavigationalStarsSet()) { + default: case AngloAmerican: - { // TRANSLATORS: The emphasis tags mark a title. txt = q_("The 57 \"selected stars\" that are listed in The Nautical Almanac jointly published by Her Majesty's Nautical Almanac Office and the US Naval Observatory since 1958; consequently, these stars are also used in navigational aids such as the 2102D Star Finder and Identifier."); break; - } case French: - { // TRANSLATORS: The emphasis tags mark a book title. txt = q_("The 81 stars that are listed in the French Nautical Almanac (The original French title is %1) published by the French Bureau des Longitudes.").arg("Ephémérides Nautiques"); break; - } case Russian: - { // TRANSLATORS: The emphasis tags mark a book title. txt = q_("The 160 stars that are listed in the Russian Nautical Almanac (The original Russian title is %1).").arg("Морской астрономический ежегодник"); break; - } case German: - { // TRANSLATORS: The emphasis tags mark a book title. txt = q_("The 80 stars that are listed in the German Nautical Almanac (The original German title is %1) published by the Federal Maritime and Hydrographic Agency of Germany.").arg("Nautisches Jahrbuch"); break; - } case GeminiAPS: - { txt = q_("Alignment Star List from the Gemini Astronomical Positioning System. The Gemini Astronomical Positioning System is a professional level computerized device for controlling small to medium German equatorial telescope mounts."); break; - } case MeadeLX200: - { txt = q_("The Meade LX200 utilizes 33 bright and well known stars to calibrate the telescope’s Object Library in the ALTAZ and POLAR alignments. These stars were selected to allow observers from anywhere in the world on any given night, to be able to easily and quickly make precision alignments."); break; - } case MeadeETX: - { txt = q_("This list from Meade ETX mount will aid the observer to find alignment stars at various times of the year."); break; - } case MeadeAS494: - { txt = q_("This list contains all the alignment stars for the Meade Autostar #494 handset (ETX60AT)."); break; - } case MeadeAS497: - { txt = q_("This list contains all the alignment stars for the Meade Autostar #497 handset."); break; - } case Celestron: - { txt = q_("Even though there are about 250 named stars in the hand control database, only 82 (stars brighter than or equal to magnitude 2.5) can be used for alignment and related tasks."); break; - } case Apollo: - { txt = q_("These 37 stars were used by the Apollo space program to navigate to the Moon from 1969-1972, Apollo 11 through Apollo 17."); break; - } case Skywatcher: - { txt = q_("This list contains all the alignment stars for the Skywatch SynScan hand controller and SynScan Pro App."); break; - } } return txt; From 5fa463861f3af7431bc66ded846011f5b4b29d30 Mon Sep 17 00:00:00 2001 From: A-j-K Date: Sat, 15 Jul 2023 00:21:02 +0100 Subject: [PATCH 5/5] Remove the default from teh switch --- plugins/NavStars/src/NavStars.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/NavStars/src/NavStars.cpp b/plugins/NavStars/src/NavStars.cpp index 289faf3e3254b..fce580a394773 100644 --- a/plugins/NavStars/src/NavStars.cpp +++ b/plugins/NavStars/src/NavStars.cpp @@ -391,7 +391,6 @@ QString NavStars::getCurrentNavigationalStarsSetDescription() const switch(getCurrentNavigationalStarsSet()) { - default: case AngloAmerican: // TRANSLATORS: The emphasis tags mark a title. txt = q_("The 57 \"selected stars\" that are listed in The Nautical Almanac jointly published by Her Majesty's Nautical Almanac Office and the US Naval Observatory since 1958; consequently, these stars are also used in navigational aids such as the 2102D Star Finder and Identifier.");