NO_GUI mode for AngleMeasure and ArchaeoLines plugins

Author: gzotti

plugins/AngleMeasure/src/AngleMeasure.cpp

@@ -80,7 +80,9 @@ AngleMeasure::AngleMeasure()
 	, flagShowHorizontalStartSkylinked(false)
 	, flagShowHorizontalEndSkylinked(false)
 	, angleHorizontal(0.)
+#ifndef NO_GUI
 	, toolbarButton(Q_NULLPTR)
+	#endif
 {
 	startPoint.set(0.,0.,0.);
 	endPoint.set(0.,0.,0.);
@@ -98,7 +100,9 @@ AngleMeasure::AngleMeasure()
 
 	setObjectName("AngleMeasure");
 
+#ifndef NO_GUI
 	configDialog = new AngleMeasureDialog();
+#endif
 	conf = StelApp::getInstance().getSettings();
 
 	messageTimer = new QTimer(this);
@@ -110,14 +114,20 @@ AngleMeasure::AngleMeasure()
 
 AngleMeasure::~AngleMeasure()
 {
+#ifndef NO_GUI
 	delete configDialog;
+#endif
 }
 
 bool AngleMeasure::configureGui(bool show)
 {
+#ifdef NO_GUI
+	return false;
+#else
 	if (show)
 		configDialog->setVisible(true);
 	return true;
+#endif
 }
 
 //! Determine which "layer" the plugin's drawing will happen on.
@@ -141,13 +151,15 @@ void AngleMeasure::init()
 
 	// Create action for enable/disable & hook up signals	
 	addAction("actionShow_Angle_Measure",        N_("Angle Measure"), N_("Angle measure"),                          "enabled", "Ctrl+A");
+#ifndef NO_GUI
 	addAction("actionShow_Angle_Measure_dialog", N_("Angle Measure"), N_("Angle measure settings"),  configDialog,  "visible" ); // no default hotkey
-
+#endif
 	// Initialize the message strings and make sure they are translated when
 	// the language changes.
 	updateMessageText();
 	connect(&app, SIGNAL(languageChanged()), this, SLOT(updateMessageText()));
 
+#ifndef NO_GUI
 	// Add a toolbar button
 	try
 	{
@@ -168,6 +180,7 @@ void AngleMeasure::init()
 	{
 		qWarning() << "Unable create toolbar button for AngleMeasure plugin: " << e.what();
 	}
+#endif
 }
 
 // handle time updates

plugins/AngleMeasure/src/AngleMeasure.hpp

@@ -205,7 +205,10 @@ private slots:
 	Vec3d perp2EndPointHor;
 	double angleHorizontal;
 
+#ifndef NO_GUI
+	AngleMeasureDialog* configDialog;
 	StelButton* toolbarButton;
+#endif
 
 	void calculateEnds();
 	void calculateEndsOneLine(const Vec3d &start, const Vec3d &end, Vec3d &perp1Start, Vec3d &perp1End, Vec3d &perp2Start, Vec3d &perp2End, double &angleEquatorial);
@@ -220,8 +223,6 @@ private slots:
 
 	QSettings* conf;
 
-	// GUI
-	AngleMeasureDialog* configDialog;
 };
 
 #include <QObject>

plugins/AngleMeasure/src/CMakeLists.txt

@@ -4,21 +4,29 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
 SET(AngleMeasure_SRCS
      AngleMeasure.hpp
      AngleMeasure.cpp
+)
+IF (STELLARIUM_GUI_MODE STREQUAL "Standard")
+LIST(APPEND AngleMeasure_SRCS
      gui/AngleMeasureDialog.hpp
      gui/AngleMeasureDialog.cpp
 )
 
 SET(AngleMeasure_UIS
      gui/angleMeasureDialog.ui
 )
+ENDIF (STELLARIUM_GUI_MODE STREQUAL "Standard")
 
 ################# compiles resources files ############
 SET(AngleMeasure_RES ../AngleMeasure.qrc)
 IF (${QT_VERSION_MAJOR} EQUAL "5")
-     QT5_WRAP_UI(AngleMeasure_UIS_H ${AngleMeasure_UIS})
+     IF (STELLARIUM_GUI_MODE STREQUAL "Standard")
+          QT5_WRAP_UI(AngleMeasure_UIS_H ${AngleMeasure_UIS})
+     ENDIF()
      QT5_ADD_RESOURCES(AngleMeasure_RES_CXX ${AngleMeasure_RES})
 ELSE()
-     QT_WRAP_UI(AngleMeasure_UIS_H ${AngleMeasure_UIS})
+     IF (STELLARIUM_GUI_MODE STREQUAL "Standard")
+          QT_WRAP_UI(AngleMeasure_UIS_H ${AngleMeasure_UIS})
+     ENDIF()
      QT_ADD_RESOURCES(AngleMeasure_RES_CXX ${AngleMeasure_RES})
 ENDIF()
 

plugins/ArchaeoLines/src/ArchaeoLines.cpp

@@ -95,7 +95,9 @@ ArchaeoLines::ArchaeoLines()
 	, flagShowCustomDeclination1(false)
 	, flagShowCustomDeclination2(false)
 	, lastJDE(0.0)
+	#ifndef NO_GUI
 	, toolbarButton(Q_NULLPTR)
+	#endif
 {
 	setObjectName("ArchaeoLines");
 	core=StelApp::getInstance().getCore();
@@ -140,7 +142,9 @@ ArchaeoLines::ArchaeoLines()
 	customDeclination1Line = new ArchaeoLine(ArchaeoLine::CustomDeclination1, 0.0);
 	customDeclination2Line = new ArchaeoLine(ArchaeoLine::CustomDeclination2, 0.0);
 
+#ifndef NO_GUI
 	configDialog = new ArchaeoLinesDialog();
+#endif
 	conf = StelApp::getInstance().getSettings();
 
 	connect(core, SIGNAL(locationChanged(StelLocation)), this, SLOT(updateObserverLocation(StelLocation)));
@@ -180,14 +184,20 @@ ArchaeoLines::~ArchaeoLines()
 	delete customDeclination1Line; customDeclination1Line=Q_NULLPTR;
 	delete customDeclination2Line; customDeclination2Line=Q_NULLPTR;
 
+#ifndef NO_GUI
 	delete configDialog; configDialog=Q_NULLPTR;
+#endif
 }
 
 bool ArchaeoLines::configureGui(bool show)
 {
+#ifdef NO_GUI
+	return false;
+#else
 	if (show)
 		configDialog->setVisible(true);
 	return true;
+#endif
 }
 
 //! Determine which "layer" the plugin's drawing will happen on.
@@ -269,8 +279,8 @@ void ArchaeoLines::init()
 	// Create action for enable/disable & hook up signals
 	QString section=N_("ArchaeoLines");
 	addAction("actionShow_ArchaeoLines",         section, N_("ArchaeoLines"), "enabled", "Ctrl+U");
+#ifndef NO_GUI
 	addAction("actionShow_ArchaeoLines_dialog",  section, N_("Show settings dialog"),  configDialog,  "visible",           "Ctrl+Shift+U");
-
 	// Add a toolbar button
 	StelApp& app=StelApp::getInstance();
 	try
@@ -292,6 +302,7 @@ void ArchaeoLines::init()
 	{
 		qWarning() << "Unable to create toolbar button for ArchaeoLines plugin: " << e.what();
 	}
+#endif
 	addAction("actionAL_showEquinoxLine",          section, N_("Show Line for Equinox"),            "flagShowEquinox"         ); // No Shortcuts configured.
 	addAction("actionAL_showSolsticeLines",        section, N_("Show Line for Solstices"),          "flagShowSolstices"       ); // No Shortcuts configured.
 	addAction("actionAL_showCrossquarterLines",    section, N_("Show Line for Crossquarter"),       "flagShowCrossquarters"   ); // No Shortcuts configured.

plugins/ArchaeoLines/src/ArchaeoLines.hpp

@@ -568,15 +568,15 @@ private slots:
 	ArchaeoLine * customAltitude2Line;
 	ArchaeoLine * customDeclination1Line;
 	ArchaeoLine * customDeclination2Line;
-
-	StelButton* toolbarButton;
 
 	QSettings* conf;
-
-	// GUI
-	ArchaeoLinesDialog* configDialog;
 	StelCore* core; // used quite often, better keep a reference...
 	StelObjectMgr* objMgr;
+
+#ifndef NO_GUI
+	ArchaeoLinesDialog* configDialog;
+	StelButton* toolbarButton;
+#endif
 };
 
 

plugins/ArchaeoLines/src/CMakeLists.txt

@@ -4,6 +4,9 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
 SET(ArchaeoLines_SRCS
      ArchaeoLines.hpp
      ArchaeoLines.cpp
+)
+IF (STELLARIUM_GUI_MODE STREQUAL "Standard")
+LIST(APPEND ArchaeoLines_SRCS
      gui/ArchaeoLinesDialog.hpp
      gui/ArchaeoLinesDialog.cpp
      gui/ArchaeoLinesDialogLocations.hpp
@@ -14,14 +17,19 @@ SET(ArchaeoLines_UIS
      gui/archaeoLinesDialog.ui
      gui/archaeoLinesDialogLocations.ui
 )
+ENDIF (STELLARIUM_GUI_MODE STREQUAL "Standard")
 
 ################# compiles resources files ############
 SET(ArchaeoLines_RES ../ArchaeoLines.qrc)
 IF (${QT_VERSION_MAJOR} EQUAL "5")
-     QT5_WRAP_UI(ArchaeoLines_UIS_H ${ArchaeoLines_UIS})
+     IF (STELLARIUM_GUI_MODE STREQUAL "Standard")
+          QT5_WRAP_UI(ArchaeoLines_UIS_H ${ArchaeoLines_UIS})
+     ENDIF()
      QT5_ADD_RESOURCES(ArchaeoLines_RES_CXX ${ArchaeoLines_RES})
 ELSE()
-     QT_WRAP_UI(ArchaeoLines_UIS_H ${ArchaeoLines_UIS})
+     IF (STELLARIUM_GUI_MODE STREQUAL "Standard")
+           QT_WRAP_UI(ArchaeoLines_UIS_H ${ArchaeoLines_UIS})
+     ENDIF()
      QT_ADD_RESOURCES(ArchaeoLines_RES_CXX ${ArchaeoLines_RES})
 ENDIF()