Expansion of skycultures through spatial and temporal extent

.github/workflows/ci.yml

@@ -74,7 +74,7 @@ jobs:
                             qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev \
                             libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin \
                             libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev \
-                            libgps-dev libmd4c-dev libmd4c-html0-dev cmake gettext libgettextpo-dev libtidy-dev libunarr-dev
+                            libgps-dev libmd4c-dev libmd4c-html0-dev cmake gettext libgettextpo-dev libtidy-dev libunarr-dev qt6-svg-dev libqt6svgwidgets6
 
     - name: Checkout repository
       uses: actions/checkout@v5
@@ -117,7 +117,7 @@ jobs:
         sudo apt install -y qt6-base-private-dev qt6-multimedia-dev qt6-positioning-dev qt6-tools-dev qt6-tools-dev-tools qt6-base-dev-tools qt6-qpa-plugins \
                             qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev libqt6charts6 libqt6opengl6-dev \
                             libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev \
-                            zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev libgps-dev libmd4c-dev libmd4c-html0-dev
+                            zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev libgps-dev libmd4c-dev libmd4c-html0-dev qt6-svg-dev libqt6svgwidgets6
 
     - name: Checkout repository
       uses: actions/checkout@v5

.github/workflows/code-quality.yml

@@ -22,7 +22,7 @@ jobs:
         # https://github.com/actions/virtual-environments/issues/2703
         #sudo ACCEPT_EULA=Y apt upgrade -o Dpkg::Options::="--force-overwrite" --yes
         #sudo apt install -y qtbase5-private-dev qtscript5-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5serialport5 libqt5serialport5-dev qtpositioning5-dev libgps-dev libqt5positioning5 libqt5positioning5-plugins qtwebengine5-dev libqt5charts5-dev zlib1g-dev libgl1-mesa-dev libdrm-dev cmake lcov libexiv2-dev libnlopt-cxx-dev
-        sudo apt install -y qt6-base-private-dev qt6-multimedia-dev qt6-positioning-dev qt6-tools-dev qt6-tools-dev-tools qt6-base-dev-tools qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev libgps-dev zlib1g-dev libgl1-mesa-dev libdrm-dev cmake lcov libexiv2-dev libnlopt-cxx-dev python3-demjson libmd4c-dev libmd4c-html0-dev
+        sudo apt install -y qt6-base-private-dev qt6-multimedia-dev qt6-positioning-dev qt6-tools-dev qt6-tools-dev-tools qt6-base-dev-tools qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev libgps-dev zlib1g-dev libgl1-mesa-dev libdrm-dev cmake lcov libexiv2-dev libnlopt-cxx-dev python3-demjson libmd4c-dev libmd4c-html0-dev qt6-svg-dev libqt6svgwidgets6
 
     - name: Checkout repository
       uses: actions/checkout@v5

.github/workflows/codeql-analysis.yml

@@ -45,7 +45,7 @@ jobs:
         # using force-overwrite due to
         # https://github.com/actions/virtual-environments/issues/2703
         #sudo ACCEPT_EULA=Y apt upgrade -o Dpkg::Options::="--force-overwrite" --yes
-        sudo apt install -y qt6-base-private-dev qt6-multimedia-dev qt6-positioning-dev qt6-tools-dev qt6-tools-dev-tools qt6-base-dev-tools qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev libgps-dev libmd4c-dev libmd4c-html0-dev
+        sudo apt install -y qt6-base-private-dev qt6-multimedia-dev qt6-positioning-dev qt6-tools-dev qt6-tools-dev-tools qt6-base-dev-tools qt6-qpa-plugins qt6-image-formats-plugins qt6-l10n-tools qt6-webengine-dev qt6-webengine-dev-tools libqt6charts6-dev libqt6charts6 libqt6opengl6-dev libqt6positioning6-plugins libqt6serialport6-dev qt6-base-dev libqt6webenginecore6-bin libqt6webengine6-data libexiv2-dev libnlopt-cxx-dev zlib1g-dev libgl1-mesa-dev libdrm-dev libglx-dev libxkbcommon-x11-dev libgps-dev libmd4c-dev libmd4c-html0-dev qt6-svg-dev libqt6svgwidgets6
 
     - name: Checkout repository
       uses: actions/checkout@v5

CMakeLists.txt

@@ -607,8 +607,12 @@ IF(${QT_VERSION} VERSION_LESS MINIMAL_QT_VERSION)
 ELSE()
      MESSAGE(STATUS "Found Qt${QT_VERSION_MAJOR}: ${QMAKE_LOCATION} (found suitable version ${QT_VERSION})")
 ENDIF()
-FIND_PACKAGE(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS
-     Concurrent Gui Network Widgets Charts Positioning)
+FIND_PACKAGE(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Concurrent Gui Network Widgets Charts Positioning)
+IF(Qt6_FOUND)
+     FIND_PACKAGE(Qt6 REQUIRED COMPONENTS SvgWidgets)
+ELSEIF(Qt5_FOUND)
+     FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Svg)
+ENDIF()
 SET(USE_BUNDLED_QTCOMPRESS 1 CACHE BOOL "Use bundled version of qtcompress")
 # Qt 6.10 split off FooPrivate from Foo.
 # https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.10.0/release-note.md

data/gui/guiRes.qrc

@@ -205,5 +205,10 @@
         <file>uieScrolldown.png</file>
         <file>uieScrollleft.png</file>
         <file>uieScrollright.png</file>
+        <file>uieSpinboxAdd.png</file>
+        <file>uieSpinboxAdd-pressed.png</file>
+        <file>uieSpinboxRemove.png</file>
+        <file>uieSpinboxRemove-pressed.png</file>
+        <file>skyCultureWorldMap.svgz</file>
     </qresource>
 </RCC>

data/gui/normalStyle.css

@@ -1128,8 +1128,8 @@ QListWidget#landscapesListWidget {
 }
 
 QListWidget#culturesListWidget {
-	min-width: 120px;
-	max-width: 220px;
+        min-width: 230px;
+	max-width: 290px;
 }
 
 /* Try to make them the same size */

plugins/SkyCultureMaker/src/CMakeLists.txt

@@ -35,6 +35,18 @@ SET( SkyCultureMaker_SRCS
      gui/ScmSkyCultureExportDialog.cpp
      gui/ScmStartDialog.hpp
      gui/ScmStartDialog.cpp
+     gui/ScmGeoLocGraphicsView.hpp
+     gui/ScmGeoLocGraphicsView.cpp
+     gui/ScmPreviewPathItem.hpp
+     gui/ScmPreviewPathItem.cpp
+     gui/ScmPreviewPolygonItem.hpp
+     gui/ScmPreviewPolygonItem.cpp
+     gui/ScmPolygonInfoTreeItem.hpp
+     gui/ScmPolygonInfoTreeItem.cpp
+     gui/ScmMultiselectionComboBox.hpp
+     gui/ScmMultiselectionComboBox.cpp
+     gui/ScmAdvancedSpinBox.hpp
+     gui/ScmAdvancedSpinBox.cpp
 
      types/Anchor.hpp
      types/Classification.hpp
@@ -80,6 +92,12 @@ ADD_LIBRARY(SkyCultureMaker-static STATIC ${SkyCultureMaker_SRCS} ${SkyCultureMa
 SET_TARGET_PROPERTIES(SkyCultureMaker-static PROPERTIES OUTPUT_NAME "SkyCultureMaker")
 
 list(APPEND SKY_CULTURE_MAKER_PLUGIN_LINK_LIBS Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets)
+IF (${QT_VERSION_MAJOR} EQUAL "5")
+     list(APPEND SKY_CULTURE_MAKER_PLUGIN_LINK_LIBS Qt${QT_VERSION_MAJOR}::Svg)
+ELSE()
+     list(APPEND SKY_CULTURE_MAKER_PLUGIN_LINK_LIBS Qt${QT_VERSION_MAJOR}::SvgWidgets)
+ENDIF()
+
 # SCM_CONVERTER_ENABLED is inherited from the parent CMakeLists.txt scope
 if(SCM_CONVERTER_ENABLED)
   list(APPEND SKY_CULTURE_MAKER_PLUGIN_LINK_LIBS libskycultureconverter unarr)

plugins/SkyCultureMaker/src/ScmSkyCulture.cpp

@@ -37,6 +37,16 @@ void scm::ScmSkyCulture::setFallbackToInternationalNames(bool fallback)
 	ScmSkyCulture::fallbackToInternationalNames = fallback;
 }
 
+void scm::ScmSkyCulture::setStartTime(int startTime)
+{
+	ScmSkyCulture::startTime = startTime;
+}
+
+void scm::ScmSkyCulture::setEndTime(const QString &endTime)
+{
+	ScmSkyCulture::endTime = endTime;
+}
+
 scm::ScmConstellation &scm::ScmSkyCulture::addConstellation(const QString &id,
                                                             const std::vector<ConstellationLine> &lines,
                                                             const bool isDarkConstellation)
@@ -45,13 +55,25 @@ scm::ScmConstellation &scm::ScmSkyCulture::addConstellation(const QString &id,
 	return *constellations.back();
 }
 
+void scm::ScmSkyCulture::addLocation(const scm::CulturePolygon &polygon)
+{
+	locations.push_back(polygon);
+}
+
 void scm::ScmSkyCulture::removeConstellation(const QString &id)
 {
 	constellations.erase(remove_if(begin(constellations), end(constellations),
 	                               [id](const std::unique_ptr<ScmConstellation> &c) { return c->getId() == id; }),
 	                     end(constellations));
 }
 
+void scm::ScmSkyCulture::removeLocation(int id)
+{
+	locations.erase(std::remove_if(std::begin(locations), std::end(locations),
+							  [id](const CulturePolygon &p) { return p.id == id; }),
+					std::end(locations));
+}
+
 scm::ScmConstellation *scm::ScmSkyCulture::getConstellation(const QString &id)
 {
 	auto it = std::find_if(constellations.begin(), constellations.end(),
@@ -67,12 +89,25 @@ std::vector<std::unique_ptr<scm::ScmConstellation>> *scm::ScmSkyCulture::getCons
 QJsonObject scm::ScmSkyCulture::toJson(const bool mergeLines) const
 {
 	QJsonObject scJsonObj;
+
 	scJsonObj["id"] = id;
+
+	QJsonArray regionArray;
+	for (const auto &currentRegion : description.region)
+	{
+		regionArray.append(REGIONS.at(currentRegion).name);
+	}
+	scJsonObj["region"] = regionArray;
+
+	scJsonObj["startTime"] = startTime;
+	scJsonObj["endTime"] = endTime;
+
 	// for some reason, the classification is inside an array, eg. ["historical"]
 	QJsonArray classificationArray = QJsonArray::fromStringList(
 		QStringList() << classificationTypeToString(description.classification));
 	scJsonObj["classification"]                  = classificationArray;
 	scJsonObj["fallback_to_international_names"] = fallbackToInternationalNames;
+
 	QJsonArray constellationsArray;
 	for (const auto &constellation : constellations)
 	{
@@ -83,6 +118,21 @@ QJsonObject scm::ScmSkyCulture::toJson(const bool mergeLines) const
 	return scJsonObj;
 }
 
+QJsonObject scm::ScmSkyCulture::getTerritoryJson() const
+{
+	QJsonObject locJsonObj;
+
+	QJsonArray locationsArray;
+	for (const auto &culturePolygon : locations)
+	{
+		locationsArray.append(culturePolygon.toJson());
+	}
+
+	locJsonObj["polygons"] = locationsArray;
+
+	return locJsonObj;
+}
+
 void scm::ScmSkyCulture::draw(StelCore *core) const
 {
 	for (auto &constellation : constellations)

plugins/SkyCultureMaker/src/ScmSkyCulture.hpp

@@ -28,6 +28,7 @@
 #include "StelCore.hpp"
 #include "StelSkyCultureMgr.hpp"
 #include "types/Classification.hpp"
+#include "types/CulturePolygon.hpp"
 #include "types/ConstellationLine.hpp"
 #include "types/Description.hpp"
 #include "types/License.hpp"
@@ -52,6 +53,12 @@ class ScmSkyCulture
 	 */
 	const QString &getId() const;
 
+	/// Sets the start time of the sky culture
+	void setStartTime(int startTime);
+
+	/// Sets the end time of the sky culture
+	void setEndTime(const QString &endTime);
+
 	/// Sets whether to show common names in addition to the culture-specific ones
 	void setFallbackToInternationalNames(bool fallback);
 
@@ -60,9 +67,15 @@ class ScmSkyCulture
 									   const std::vector<ConstellationLine> &lines, 
 									   const bool isDarkConstellation);
 
+	/// Adds a location to the sky culture
+	void addLocation(const scm::CulturePolygon &polygon);
+
 	/// Removes a constellation from the sky culture by its ID
 	void removeConstellation(const QString &id);
 
+	/// Removes a location from the sky culture by its ID
+	void removeLocation(int id);
+
 	/// Gets a constellation from the sky culture by its ID
 	ScmConstellation *getConstellation(const QString &id);
 
@@ -78,6 +91,11 @@ class ScmSkyCulture
 	*/
 	QJsonObject toJson(const bool mergeLines) const;
 
+	/**
+	* @brief Returns the territory of the sky culture as a JSON object
+	*/
+	QJsonObject getTerritoryJson() const;
+
 	/**
 	* @brief Draws the sky culture.
 	*/
@@ -117,6 +135,16 @@ class ScmSkyCulture
 
 	/// The description of the sky culture
 	scm::Description description;
+
+	/// The geographical location (as polygons) of the sky culture
+	QList<CulturePolygon> locations;
+
+	/// The earliest year associated with a territory of the sky culture
+	int startTime;
+
+	/// The latest year associated with a territory of the sky culture
+	// (represented as QString because culture can still exist)
+	QString endTime;
 };
 
 } // namespace scm

plugins/SkyCultureMaker/src/SkyCultureMaker.cpp

@@ -424,6 +424,38 @@ void SkyCultureMaker::setSkyCultureDescription(const scm::Description &descripti
 	}
 }
 
+void SkyCultureMaker::setSkyCultureStartTime(int startTime)
+{
+	if (currentSkyCulture != nullptr)
+	{
+		currentSkyCulture->setStartTime(startTime);
+	}
+}
+
+void SkyCultureMaker::setSkyCultureEndTime(const QString &endTime)
+{
+	if (currentSkyCulture != nullptr)
+	{
+		currentSkyCulture->setEndTime(endTime);
+	}
+}
+
+void SkyCultureMaker::addSkyCultureLocation(const scm::CulturePolygon &polygon)
+{
+	if (currentSkyCulture != nullptr)
+	{
+		currentSkyCulture->addLocation(polygon);
+	}
+}
+
+void SkyCultureMaker::removeSkyCultureLocation(int id)
+{
+	if (currentSkyCulture != nullptr)
+	{
+		currentSkyCulture->removeLocation(id);
+	}
+}
+
 void SkyCultureMaker::setTempArtwork(const scm::ScmConstellationArtwork *artwork)
 {
 	tempArtwork = artwork;

plugins/SkyCultureMaker/src/SkyCultureMaker.hpp

@@ -149,6 +149,30 @@ class SkyCultureMaker : public StelModule
 	 */
 	void setSkyCultureDescription(const scm::Description &description);
 
+	/**
+	 * @brief Sets the current sky culture start time.
+	 * @param startTime The start time to set.
+	 */
+	void setSkyCultureStartTime(int startTime);
+
+	/**
+	 * @brief Sets the current sky culture end time.
+	 * @param endTime The end time to set.
+	 */
+	void setSkyCultureEndTime(const QString &endTime);
+
+	/**
+	 * @brief Adds a CulturePolygon to the sky culture.
+	 * @param polygon The culturePolygon to add.
+	 */
+	void addSkyCultureLocation(const scm::CulturePolygon &polygon);
+
+	/**
+	 * @brief Removes a CulturePolygon from the sky culture by its Id.
+	 * @param id The identifier of the location.
+	 */
+	void removeSkyCultureLocation(int id);
+
 	/**
 	 * @brief Saves the current sky culture description as markdown text.
 	 * @param directory The directory to save the description in.