add button for drawing dark constellations

xLPMG · xLPMG · commit 6c49298b0748 · 2025-09-04T23:19:15.000+02:00
diff --git a/plugins/SkyCultureMaker/src/ScmConstellation.hpp b/plugins/SkyCultureMaker/src/ScmConstellation.hpp
@@ -213,6 +213,13 @@ class ScmConstellation
 	 */
 	void show();
 
+	/** 
+	 * @brief Returns whether the constellation is a dark constellation.
+	 * 
+	 * @return true If the constellation is a dark constellation, false otherwise.
+	 */
+	bool getIsDarkConstellation() const { return isDarkConstellation; }
+
 private:
 	/// Identifier of the constellation
 	QString id;
diff --git a/plugins/SkyCultureMaker/src/ScmDraw.hpp b/plugins/SkyCultureMaker/src/ScmDraw.hpp
@@ -194,6 +194,13 @@ public slots:
 	 */
 	void setTool(DrawTools tool);
 
+	/**
+	 * @brief Sets the drawing mode.
+	 * 
+	 * @param mode The drawing mode to use.
+	 */
+	void setDrawingMode(DrawingMode mode) { drawingMode = mode; }
+
 	/**
 	 * @brief Resets the currently drawn lines.
 	 */
diff --git a/plugins/SkyCultureMaker/src/SkyCultureMaker.cpp b/plugins/SkyCultureMaker/src/SkyCultureMaker.cpp
@@ -333,9 +333,19 @@ void SkyCultureMaker::setConstellationDialogVisibility(bool b)
 		scmConstellationDialog->setVisible(b);
 	}
 
+	// Disable the add constellation buttons when the dialog is opened
+	scmSkyCultureDialog->updateAddConstellationButtons(!b);
 	setIsLineDrawEnabled(b);
 }
 
+void SkyCultureMaker::setConstellationDialogIsDarkConstellation(bool isDarkConstellation)
+{
+	if (scmConstellationDialog != nullptr)
+	{
+		scmConstellationDialog->setIsDarkConstellation(isDarkConstellation);
+	}
+}
+
 void SkyCultureMaker::setSkyCultureExportDialogVisibility(bool b)
 {
 	if (b != scmSkyCultureExportDialog->visible())
diff --git a/plugins/SkyCultureMaker/src/SkyCultureMaker.hpp b/plugins/SkyCultureMaker/src/SkyCultureMaker.hpp
@@ -105,6 +105,13 @@ class SkyCultureMaker : public StelModule
 	 */
 	void setConstellationDialogVisibility(bool b);
 
+	/**
+	 * @brief Sets whether the constellation dialog is for a dark constellation.
+	 *
+	 * @param isDarkConstellation The boolean value to be set.
+	 */
+	void setConstellationDialogIsDarkConstellation(bool isDarkConstellation);
+
 	/**
 	 * @brief Shows the sky culture export dialog.
 	 *
diff --git a/plugins/SkyCultureMaker/src/gui/ScmConstellationDialog.cpp b/plugins/SkyCultureMaker/src/gui/ScmConstellationDialog.cpp
@@ -33,6 +33,7 @@
 #include <QDebug>
 #include <QFileDialog>
 #include <QFileInfo>
+#include "types/DrawingMode.hpp"
 
 ScmConstellationDialog::ScmConstellationDialog(SkyCultureMaker *maker)
 	: StelDialogSeparate("ScmConstellationDialog")
@@ -69,6 +70,7 @@ void ScmConstellationDialog::loadFromConstellation(scm::ScmConstellation *conste
 
 	// Save the constellation that is currently being edited
 	constellationBeingEdited = constellation;
+	setIsDarkConstellation(constellation->getIsDarkConstellation());
 
 	constellationId            = constellation->getId();
 	constellationEnglishName   = constellation->getEnglishName();
@@ -97,6 +99,26 @@ void ScmConstellationDialog::loadFromConstellation(scm::ScmConstellation *conste
 	updateArtwork();
 }
 
+void ScmConstellationDialog::setIsDarkConstellation(bool isDark)
+{
+	if (!isDialogInitialized)
+	{
+		createDialogContent();
+	}
+	
+	scm::ScmDraw *draw = maker->getScmDraw();
+	if(draw != nullptr)
+	{
+		draw->setDrawingMode(isDark ? scm::DrawingMode::Coordinates : scm::DrawingMode::StarsAndDSO);
+	}
+	
+	if (ui != nullptr)
+	{
+		ui->titleBar->setTitle(isDark ? q_("SCM: Dark Constellation Editor") : q_("SCM: Constellation Editor"));
+		ui->labelsTitle->setText(isDark ? q_("Please name your Dark Constellation") : q_("Please name your Constellation"));
+	}
+}
+
 void ScmConstellationDialog::retranslate()
 {
 	if (dialog)
@@ -118,6 +140,8 @@ void ScmConstellationDialog::createDialogContent()
 	ui->artwork_image->setScene(imageItem->scene());
 	ui->bind_star->setEnabled(false);
 
+	setIsDarkConstellation(false);
+
 	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
 	connect(ui->titleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint)));
 	connect(ui->titleBar, &TitleBar::closeClicked, this, &ScmConstellationDialog::close);
diff --git a/plugins/SkyCultureMaker/src/gui/ScmConstellationDialog.hpp b/plugins/SkyCultureMaker/src/gui/ScmConstellationDialog.hpp
@@ -46,6 +46,7 @@ class ScmConstellationDialog : public StelDialogSeparate
 	ScmConstellationDialog(SkyCultureMaker *maker);
 	~ScmConstellationDialog() override;
 	void loadFromConstellation(scm::ScmConstellation *constellation);
+	void setIsDarkConstellation(bool isDarkConstellation);
 
 public slots:
 	void retranslate() override;
diff --git a/plugins/SkyCultureMaker/src/gui/ScmSkyCultureDialog.cpp b/plugins/SkyCultureMaker/src/gui/ScmSkyCultureDialog.cpp
@@ -104,8 +104,10 @@ void ScmSkyCultureDialog::createDialogContent()
 	ui->ExportSkyCultureBtn->setEnabled(false);
 	ui->RemoveConstellationBtn->setEnabled(false);
 	ui->EditConstellationBtn->setEnabled(false);
+
 	connect(ui->ExportSkyCultureBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::saveSkyCulture);
-	connect(ui->AddConstellationBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::constellationDialog);
+	connect(ui->AddConstellationBtn, &QPushButton::clicked, this, [this]() { openConstellationDialog(false); });
+	connect(ui->AddDarkConstellationBtn, &QPushButton::clicked, this, [this]() { openConstellationDialog(true); });
 
 	connect(ui->EditConstellationBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::editSelectedConstellation);
 	connect(ui->constellationsList, &QListWidget::itemSelectionChanged, this,
@@ -247,9 +249,10 @@ void ScmSkyCultureDialog::removeSelectedConstellation()
 	}
 }
 
-void ScmSkyCultureDialog::constellationDialog()
+void ScmSkyCultureDialog::openConstellationDialog(bool isDarkConstellation)
 {
 	maker->setConstellationDialogVisibility(true);
+	maker->setConstellationDialogIsDarkConstellation(isDarkConstellation);
 }
 
 void ScmSkyCultureDialog::setIdFromName(QString &name)
@@ -258,6 +261,12 @@ void ScmSkyCultureDialog::setIdFromName(QString &name)
 	maker->getCurrentSkyCulture()->setId(id);
 }
 
+void ScmSkyCultureDialog::updateAddConstellationButtons(bool enabled)
+{
+	ui->AddConstellationBtn->setEnabled(enabled);
+	ui->AddDarkConstellationBtn->setEnabled(enabled);
+}
+
 void ScmSkyCultureDialog::updateEditConstellationButton()
 {
 	if (!ui->constellationsList->selectedItems().isEmpty())
diff --git a/plugins/SkyCultureMaker/src/gui/ScmSkyCultureDialog.hpp b/plugins/SkyCultureMaker/src/gui/ScmSkyCultureDialog.hpp
@@ -71,6 +71,13 @@ class ScmSkyCultureDialog : public StelDialogSeparate
 	 */
 	void resetDialog();
 
+	/**
+	 * @brief Updates the add constellation button state.
+	 *
+	 * @param enabled Whether the button should be enabled or disabled.
+	 */
+	void updateAddConstellationButtons(bool enabled);
+
 public slots:
 	void retranslate() override;
 	void close() override;
@@ -80,7 +87,7 @@ protected slots:
 
 private slots:
 	void saveSkyCulture();
-	void constellationDialog();
+	void openConstellationDialog(bool isDarkConstellation);
 	void editSelectedConstellation();
 	void removeSelectedConstellation();
 	void updateEditConstellationButton();
diff --git a/plugins/SkyCultureMaker/src/gui/scmConstellationDialog.ui b/plugins/SkyCultureMaker/src/gui/scmConstellationDialog.ui
@@ -128,9 +128,6 @@
        </property>
        <item>
         <widget class="QLabel" name="labelsTitle">
-         <property name="text">
-          <string>Please name the Constellation</string>
-         </property>
         </widget>
        </item>
        <item>
diff --git a/plugins/SkyCultureMaker/src/gui/scmSkyCultureDialog.ui b/plugins/SkyCultureMaker/src/gui/scmSkyCultureDialog.ui
@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>418</width>
-    <height>401</height>
+    <width>355</width>
+    <height>426</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>0</width>
+    <width>355</width>
     <height>0</height>
    </size>
   </property>
@@ -120,13 +120,10 @@
             </property>
             <property name="html">
              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-hr { height: 1px; border-width: 0; }
-li.unchecked::marker { content: &quot;\2610&quot;; }
-li.checked::marker { content: &quot;\2612&quot;; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Segoe UI'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="acceptRichText">
              <bool>false</bool>
@@ -167,8 +164,8 @@ li.checked::marker { content: &quot;\2612&quot;; }
            </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="overviewConstellationBtnLayout">
-            <item>
+           <layout class="QGridLayout" name="overviewConstellationBtnLayout">
+            <item row="0" column="0">
              <widget class="QPushButton" name="AddConstellationBtn">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -178,16 +175,35 @@ li.checked::marker { content: &quot;\2612&quot;; }
               </property>
               <property name="minimumSize">
                <size>
-                <width>100</width>
+                <width>140</width>
                 <height>0</height>
                </size>
               </property>
               <property name="text">
-               <string>Add</string>
+               <string>Add Constellation</string>
               </property>
              </widget>
             </item>
-            <item>
+            <item row="0" column="1">
+             <widget class="QPushButton" name="AddDarkConstellationBtn">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>140</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Add Dark Constellation</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
              <widget class="QPushButton" name="EditConstellationBtn">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -197,7 +213,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
               </property>
               <property name="minimumSize">
                <size>
-                <width>100</width>
+                <width>140</width>
                 <height>0</height>
                </size>
               </property>
@@ -206,7 +222,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
               </property>
              </widget>
             </item>
-            <item>
+            <item row="1" column="1">
              <widget class="QPushButton" name="RemoveConstellationBtn">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -216,7 +232,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
               </property>
               <property name="minimumSize">
                <size>
-                <width>100</width>
+                <width>140</width>
                 <height>0</height>
                </size>
               </property>
@@ -299,8 +315,8 @@ li.checked::marker { content: &quot;\2612&quot;; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>395</width>
-               <height>1200</height>
+               <width>320</width>
+               <height>1886</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="descriptionLayout">
@@ -708,8 +724,8 @@ li.checked::marker { content: &quot;\2612&quot;; }
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
-                  <width>20</width>
-                  <height>40</height>
+                  <width>40</width>
+                  <height>20</height>
                  </size>
                 </property>
                </spacer>

Original file line number	Diff line number	Diff line change
`@@ -333,9 +333,19 @@ void SkyCultureMaker::setConstellationDialogVisibility(bool b)`
`333`	`333`	`scmConstellationDialog->setVisible(b);`
`334`	`334`	`}`
`335`	`335`
	`336`	`+ // Disable the add constellation buttons when the dialog is opened`
	`337`	`+ scmSkyCultureDialog->updateAddConstellationButtons(!b);`
`336`	`338`	`setIsLineDrawEnabled(b);`
`337`	`339`	`}`
`338`	`340`
	`341`	`+void SkyCultureMaker::setConstellationDialogIsDarkConstellation(bool isDarkConstellation)`
	`342`	`+{`
	`343`	`+ if (scmConstellationDialog != nullptr)`
	`344`	`+ {`
	`345`	`+ scmConstellationDialog->setIsDarkConstellation(isDarkConstellation);`
	`346`	`+ }`
	`347`	`+}`
	`348`	`+`
`339`	`349`	`void SkyCultureMaker::setSkyCultureExportDialogVisibility(bool b)`
`340`	`350`	`{`
`341`	`351`	`if (b != scmSkyCultureExportDialog->visible())`
Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,10 @@ void ScmSkyCultureDialog::createDialogContent()`
`104`	`104`	`ui->ExportSkyCultureBtn->setEnabled(false);`
`105`	`105`	`ui->RemoveConstellationBtn->setEnabled(false);`
`106`	`106`	`ui->EditConstellationBtn->setEnabled(false);`
	`107`	`+`
`107`	`108`	`connect(ui->ExportSkyCultureBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::saveSkyCulture);`
`108`		`- connect(ui->AddConstellationBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::constellationDialog);`
	`109`	`+ connect(ui->AddConstellationBtn, &QPushButton::clicked, this, [this]() { openConstellationDialog(false); });`
	`110`	`+ connect(ui->AddDarkConstellationBtn, &QPushButton::clicked, this, [this]() { openConstellationDialog(true); });`
`109`	`111`
`110`	`112`	`connect(ui->EditConstellationBtn, &QPushButton::clicked, this, &ScmSkyCultureDialog::editSelectedConstellation);`
`111`	`113`	`connect(ui->constellationsList, &QListWidget::itemSelectionChanged, this,`
`@@ -247,9 +249,10 @@ void ScmSkyCultureDialog::removeSelectedConstellation()`
`247`	`249`	`}`
`248`	`250`	`}`
`249`	`251`
`250`		`-void ScmSkyCultureDialog::constellationDialog()`
	`252`	`+void ScmSkyCultureDialog::openConstellationDialog(bool isDarkConstellation)`
`251`	`253`	`{`
`252`	`254`	`maker->setConstellationDialogVisibility(true);`
	`255`	`+ maker->setConstellationDialogIsDarkConstellation(isDarkConstellation);`
`253`	`256`	`}`
`254`	`257`
`255`	`258`	`void ScmSkyCultureDialog::setIdFromName(QString &name)`
`@@ -258,6 +261,12 @@ void ScmSkyCultureDialog::setIdFromName(QString &name)`
`258`	`261`	`maker->getCurrentSkyCulture()->setId(id);`
`259`	`262`	`}`
`260`	`263`
	`264`	`+void ScmSkyCultureDialog::updateAddConstellationButtons(bool enabled)`
	`265`	`+{`
	`266`	`+ ui->AddConstellationBtn->setEnabled(enabled);`
	`267`	`+ ui->AddDarkConstellationBtn->setEnabled(enabled);`
	`268`	`+}`
	`269`	`+`
`261`	`270`	`void ScmSkyCultureDialog::updateEditConstellationButton()`
`262`	`271`	`{`
`263`	`272`	`if (!ui->constellationsList->selectedItems().isEmpty())`