Fixes from PR review

Author: RivinHD

plugins/SkyCultureMaker/src/SkyCultureMaker.cpp

@@ -154,9 +154,11 @@ void SkyCultureMaker::init()
 	{
 		QPixmap iconScmDisabled(":/SkyCultureMaker/bt_SCM_Off.png");
 		QPixmap iconScmEnabled(":/SkyCultureMaker/bt_SCM_On.png");
-		qDebug() << "SkyCultureMaker: " << (iconScmDisabled.isNull() ? "Failed to load image: bt_SCM_Off.png"
+		qDebug() << "SkyCultureMaker: "
+			 << (iconScmDisabled.isNull() ? "Failed to load image: bt_SCM_Off.png"
 		                                      : "Loaded image: bt_SCM_Off.png");
-		qDebug() << "SkyCultureMaker: " << (iconScmEnabled.isNull() ? "Failed to load image: bt_SCM_On.png"
+		qDebug() << "SkyCultureMaker: "
+			 << (iconScmEnabled.isNull() ? "Failed to load image: bt_SCM_On.png"
 		                                     : "Loaded image: bt_SCM_On.png");
 
 		StelGui *gui = dynamic_cast<StelGui *>(app.getGui());
@@ -535,6 +537,12 @@ void SkyCultureMaker::openConstellationDialog(const QString &constellationId)
 	{
 		// Load the necessary data
 		scm::ScmSkyCulture *skyCulture = getCurrentSkyCulture();
+		if (skyCulture == nullptr)
+		{
+			qDebug() << "SkyCultureMaker: Current Sky Culture is not initialized.";
+			return;
+		}
+
 		scm::ScmConstellation *constellation = skyCulture->getConstellation(constellationId);
 		if (constellation != nullptr)
 		{

plugins/SkyCultureMaker/src/gui/ScmConstellationDialog.cpp

@@ -293,7 +293,14 @@ void ScmConstellationDialog::bindSelectedStar()
 	}
 
 	ScmConstellationImageAnchor *anchor = imageItem->getSelectedAnchor();
-	bool success                        = anchor->trySetStarHip(stelObj->getID());
+	if (anchor == nullptr)
+	{
+		ui->infoLbl->setText("WARNING: No anchor is selected.");
+		qDebug() << "SkyCultureMaker: No anchor is selected";
+		return;
+	}
+
+	bool success = anchor->trySetStarHip(stelObj->getID());
 	if (success == false)
 	{
 		ui->infoLbl->setText("WARNING: The selected object must contain a HIP number.");
@@ -316,7 +323,8 @@ void ScmConstellationDialog::tabChanged(int index)
 bool ScmConstellationDialog::canConstellationBeSaved() const
 {
 	// shouldnt happen
-	if (maker->getCurrentSkyCulture() == nullptr)
+	scm::ScmSkyCulture *currentSkyCulture = maker->getCurrentSkyCulture();
+	if (currentSkyCulture == nullptr)
 	{
 		ui->infoLbl->setText("WARNING: Could not save: Sky Culture is not set");
 		qDebug() << "SkyCultureMaker: Could not save: Sky Culture is not set";
@@ -340,7 +348,7 @@ bool ScmConstellationDialog::canConstellationBeSaved() const
 	}
 
 	// Not editing a constellation, but the ID already exists
-	if (constellationBeingEdited == nullptr && maker->getCurrentSkyCulture()->getConstellation(finalId) != nullptr)
+	if (constellationBeingEdited == nullptr && currentSkyCulture->getConstellation(finalId) != nullptr)
 	{
 		ui->infoLbl->setText("WARNING: Could not save: Constellation with this ID already exists");
 		qDebug() << "SkyCultureMaker: Could not save: Constellation with this ID already exists, id = "
@@ -349,7 +357,7 @@ bool ScmConstellationDialog::canConstellationBeSaved() const
 	}
 	// Editing a constellation, but the ID already exists and is not the same as the one being edited
 	else if (constellationBeingEdited != nullptr && constellationBeingEdited->getId() != finalId &&
-	         maker->getCurrentSkyCulture()->getConstellation(finalId) != nullptr)
+	         currentSkyCulture->getConstellation(finalId) != nullptr)
 	{
 		ui->infoLbl->setText("WARNING: Could not save: Constellation with this ID already exists");
 		qDebug() << "SkyCultureMaker: Could not save: Constellation with this ID already exists, id = "

plugins/SkyCultureMaker/src/gui/ScmConstellationImage.hpp

@@ -21,8 +21,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ScmConstellationImage_H
-#define ScmConstellationImage_H
+#ifndef SCM_CONSTELLATION_IMAGE_H
+#define SCM_CONSTELLATION_IMAGE_H
 
 #include "ScmConstellationArtwork.hpp"
 #include "ScmConstellationImageAnchor.hpp"
@@ -129,4 +129,4 @@ class ScmConstellationImage : public QGraphicsPixmapItem
 	scm::ScmConstellationArtwork artwork;
 };
 
-#endif // ScmConstellationImage_H
+#endif // SCM_CONSTELLATION_IMAGE_H

plugins/SkyCultureMaker/src/gui/ScmConstellationImageAnchor.hpp

@@ -21,8 +21,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ScmConstellationImageAnchor_H
-#define ScmConstellationImageAnchor_H
+#ifndef SCM_CONSTELLATION_IMAGE_ANCHOR_H
+#define SCM_CONSTELLATION_IMAGE_ANCHOR_H
 
 #include "StarMgr.hpp"
 #include "VecMath.hpp"
@@ -156,4 +156,4 @@ class ScmConstellationImageAnchor : public QGraphicsEllipseItem
 	QRectF movementBound;
 };
 
-#endif // ScmConstellationImageAnchor_H
+#endif // SCM_CONSTELLATION_IMAGE_ANCHOR_H

plugins/SkyCultureMaker/src/gui/ScmSkyCultureDialog.cpp

@@ -104,12 +104,10 @@ void ScmSkyCultureDialog::createDialogContent()
 	ui->SaveSkyCultureBtn->setEnabled(false);
 	ui->RemoveConstellationBtn->setEnabled(false);
 	ui->EditConstellationBtn->setEnabled(false);
-	ui->EditConstellationBtn->setToolTip("Warning: Editing a constellation resets the artwork.");
 	connect(ui->SaveSkyCultureBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::saveSkyCulture);
 	connect(ui->AddConstellationBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::constellationDialog);
 
-	connect(ui->EditConstellationBtn, &QPushButton::clicked, this,
-	        &ScmSkyCultureDialog::editSelectedConstellation);
+	connect(ui->EditConstellationBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::editSelectedConstellation);
 	connect(ui->constellationsList, &QListWidget::itemSelectionChanged, this,
 	        &ScmSkyCultureDialog::updateEditConstellationButton);
 
@@ -180,7 +178,7 @@ void ScmSkyCultureDialog::editSelectedConstellation()
 	auto selectedItems = ui->constellationsList->selectedItems();
 	if (!selectedItems.isEmpty() && constellations != nullptr)
 	{
-		QListWidgetItem *item = selectedItems.first();
+		QListWidgetItem *item     = selectedItems.first();
 		QString constellationName = item->text();
 
 		// Get Id by comparing to the display name
@@ -195,7 +193,7 @@ void ScmSkyCultureDialog::editSelectedConstellation()
 				break;
 			}
 		}
-		
+
 		maker->openConstellationDialog(selectedConstellationId);
 	}
 }