SCM: Fix: Deleted lines during creation of a constellation end up in the output (#4595)

Fix #4593

Author: xLPMG

plugins/SkyCultureMaker/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Sky Culture Maker Plugin - Changelog
+
+1.0.1
+Added: Option to automatically merge lines into polylines on export (#4563)
+Moved: Constellation description input fields to constellation editor (#4594)
+Fixed: Erased lines are still exported (#4595)
+Fixed: Drawn constellations are not reset after "Export and Exit" (#4557)
+Fixed: "Export and Exit" exits even when export failed, deleting all unsaved progress (#4580)
+Fixed: Stop drawing line key (Double Right Click) only works when Star/DSO is selected (#4557)
+Fixed: Not all SC description input fields that are marked required are actually checked (#4557)
+Fixed: No formal checks for 'Constellations' input field in SC description (#4557)
+
+1.0.0
+Initial release of the Sky Culture Maker Plugin

plugins/SkyCultureMaker/ChangeLog

@@ -38,16 +38,14 @@ SET( SkyCultureMaker_SRCS
 
      types/Anchor.hpp
      types/Classification.hpp
-     types/CoordinateLine.hpp
+     types/ConstellationLine.hpp
      types/Description.hpp
      types/DialogID.hpp
      types/Drawing.hpp
      types/DrawingMode.hpp
      types/DrawTools.hpp
      types/License.hpp
-     types/Lines.hpp
      types/SkyPoint.hpp
-     types/StarLine.hpp
 )
 
 SET( SCM_UIS

plugins/SkyCultureMaker/src/CMakeLists.txt

@@ -25,11 +25,9 @@
 #include <QDir>
 #include <QFileInfo>
 
-scm::ScmConstellation::ScmConstellation(const QString &id, const std::vector<CoordinateLine> &coordinates,
-                                        const std::vector<StarLine> &stars, const bool isDarkConstellation)
+scm::ScmConstellation::ScmConstellation(const QString &id, const std::vector<ConstellationLine> &lines, const bool isDarkConstellation)
 	: id(id)
-	, coordinates(coordinates)
-	, stars(stars)
+	, lines(lines)
 	, isDarkConstellation(isDarkConstellation)
 {
 	QSettings *conf = StelApp::getInstance().getSettings();
@@ -97,23 +95,15 @@ const scm::ScmConstellationArtwork &scm::ScmConstellation::getArtwork() const
 	return artwork;
 }
 
-void scm::ScmConstellation::setConstellation(const std::vector<CoordinateLine> &coordinates,
-                                             const std::vector<StarLine> &stars)
+void scm::ScmConstellation::setLines(const std::vector<ConstellationLine> &lines)
 {
-	scm::ScmConstellation::coordinates = coordinates;
-	scm::ScmConstellation::stars       = stars;
-
+	scm::ScmConstellation::lines = lines;
 	updateTextPosition();
 }
 
-const std::vector<scm::CoordinateLine> &scm::ScmConstellation::getCoordinates() const
-{
-	return coordinates;
-}
-
-const std::vector<scm::StarLine> &scm::ScmConstellation::getStars() const
+const std::vector<scm::ConstellationLine> &scm::ScmConstellation::getLines() const
 {
-	return stars;
+	return lines;
 }
 
 void scm::ScmConstellation::drawConstellation(StelCore *core, const Vec3f &lineColor, const Vec3f &nameColor) const
@@ -129,9 +119,9 @@ void scm::ScmConstellation::drawConstellation(StelCore *core, const Vec3f &lineC
 
 	painter.setColor(lineColor, 1.0f);
 
-	for (CoordinateLine p : coordinates)
+	for (const ConstellationLine &line : lines)
 	{
-		painter.drawGreatCircleArc(p.start, p.end);
+		painter.drawGreatCircleArc(line.start.coordinate, line.end.coordinate);
 	}
 
 	drawNames(core, painter, nameColor);
@@ -198,17 +188,17 @@ QJsonObject scm::ScmConstellation::toJson(const QString &skyCultureId, const boo
 	if (!isDarkConstellation)
 	{
 		// not a dark constellation, so we can add stars
-		for (const auto &star : stars)
+		for (const auto &line : lines)
 		{
-			linesArray.append(star.toJson());
+			linesArray.append(line.starsToJson());
 		}
 	}
 	else
 	{
 		// dark constellation, so only add coordinates
-		for (const auto &coord : coordinates)
+		for (const auto &line : lines)
 		{
-			linesArray.append(coord.toJson());
+			linesArray.append(line.coordinatesToJson());
 		}
 	}
 
@@ -272,10 +262,10 @@ bool scm::ScmConstellation::saveArtwork(const QString &directory)
 void scm::ScmConstellation::updateTextPosition()
 {
 	XYZname.set(0., 0., 0.);
-	for (CoordinateLine p : coordinates)
+	for (const ConstellationLine &line : lines)
 	{
-		XYZname += p.end;
-		XYZname += p.start;
+		XYZname += line.end.coordinate;
+		XYZname += line.start.coordinate;
 	}
 	XYZname.normalize();
 }

plugins/SkyCultureMaker/src/ScmConstellation.cpp

@@ -26,8 +26,7 @@
 
 #include "ScmConstellationArtwork.hpp"
 #include "VecMath.hpp"
-#include "types/CoordinateLine.hpp"
-#include "types/StarLine.hpp"
+#include "types/ConstellationLine.hpp"
 #include <StelCore.hpp>
 #include <optional>
 #include <variant>
@@ -42,8 +41,7 @@ namespace scm
 class ScmConstellation
 {
 public:
-	ScmConstellation(const QString &id, const std::vector<CoordinateLine> &coordinates,
-	                 const std::vector<StarLine> &stars, const bool isDarkConstellation);
+	ScmConstellation(const QString &id, const std::vector<ConstellationLine> &lines, const bool isDarkConstellation);
 
 	/// The frame that is used for calculation and is drawn on.
 	static const StelCore::FrameType drawFrame = StelCore::FrameJ2000;
@@ -130,27 +128,18 @@ class ScmConstellation
 	const ScmConstellationArtwork &getArtwork() const;
 
 	/**
-    * @brief Sets the coordinate lines and star lines of the constellation.
+    * @brief Sets the lines of the constellation.
     * 
-    * @param coordinates The coordinates of the constellation. 
-	* @param stars The equivalent stars to the coordinates.
+    * @param lines The lines of the constellation.
     */
-	void setConstellation(const std::vector<CoordinateLine> &coordinates, const std::vector<StarLine> &stars);
+	void setLines(const std::vector<ConstellationLine> &lines);
 
 	/**
-	 * @brief Gets the coordinates of the constellation.
+	 * @brief Gets the lines of the constellation.
 	 * 
-	 * @return The coordinates of the constellation.
+	 * @return The lines of the constellation.
 	 */
-	const std::vector<CoordinateLine> &getCoordinates() const;
-
-	/**
-	 * @brief Gets the stars of the constellation.
-	 * 
-	 * @return The stars of the constellation.
-	 */
-	const std::vector<StarLine> &getStars() const;
-
+	const std::vector<ConstellationLine> &getLines() const;
 	/**
 	 * @brief Draws the constellation based on the coordinates.
 	 *
@@ -237,11 +226,8 @@ class ScmConstellation
 	/// References to the sources of the name spellings
 	std::optional<QVector<int>> references;
 
-	/// List of coordinates forming the segments.
-	std::vector<CoordinateLine> coordinates;
-
-	/// List of stars forming the segments. Might be empty.
-	std::vector<StarLine> stars;
+	/// The lines forming the constellation
+	std::vector<ConstellationLine> lines;
 
 	/// A short description of the constellation that could be shown in e.g. an info block.
 	QString description;