From 2ecddb0dff96087bc20f6fd48e222c70a72d96ee Mon Sep 17 00:00:00 2001 From: Irina Stefan Date: Thu, 14 Dec 2023 10:01:17 -0700 Subject: [PATCH] Reverted changes to gui apps, since they seem to have been addressed in the main repo. --- Makefile | 2 +- gui/apps/cameraGUI/cameraGUI.pro | 16 ++++++++-------- gui/apps/coronAlignGUI/coronAlignGUI.pro | 20 ++++++++++---------- gui/apps/dmCtrlGUI/dmCtrlGUI.pro | 16 ++++++++-------- gui/apps/dmModeGUI/dmModeGUI.pro | 16 ++++++++-------- gui/apps/loopCtrlGUI/loopCtrlGUI.pro | 16 ++++++++-------- gui/apps/offloadCtrlGUI/offloadCtrlGUI.pro | 8 ++++---- gui/apps/pupilGuideGUI/pupilGuideGUI.pro | 20 ++++++++++---------- gui/apps/pwr/pwrGUI.pro | 4 ---- gui/apps/roiGUI/roiGUI.pro | 16 ++++++++-------- gui/apps/ttmGUI/ttmGUI.pro | 18 +++++++++--------- 11 files changed, 74 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 6ee809592..08c1a8d3d 100644 --- a/Makefile +++ b/Makefile @@ -236,7 +236,7 @@ guis_install: rtimv_plugins_install (cd gui/apps/$$gui; ${MAKE} install) || exit 1; \ done -guis_clean: rtimv_plugins_clean +guis_clean: rtimv_plugins_clean for gui in ${all_guis}; do \ (cd gui/apps/$$gui; ${MAKE} clean) || exit 1; \ done diff --git a/gui/apps/cameraGUI/cameraGUI.pro b/gui/apps/cameraGUI/cameraGUI.pro index 9e848497e..dc9e84780 100644 --- a/gui/apps/cameraGUI/cameraGUI.pro +++ b/gui/apps/cameraGUI/cameraGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = cameraGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib CONFIG+=debug @@ -24,7 +24,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.cameraGUI @@ -49,9 +49,9 @@ HEADERS += ../../widgets/camera/camera.hpp \ ../../widgets/stage/stage.hpp \ ../../widgets/camera/shutterStatus.hpp \ ../../lib/multiIndiManager.hpp - -SOURCES += cameraGUI_main.cpp - + +SOURCES += cameraGUI_main.cpp + FORMS += ../../widgets/camera/camera.ui \ ../../widgets/xWidgets/fsmDisplay.ui \ ../../widgets/xWidgets/statusEntry.ui \ @@ -61,11 +61,11 @@ FORMS += ../../widgets/camera/camera.ui \ ../../widgets/stage/stage.ui \ ../../widgets/camera/shutterStatus.ui \ ../../widgets/xWidgets/selectionSw.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a \ -lmxlib -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/coronAlignGUI/coronAlignGUI.pro b/gui/apps/coronAlignGUI/coronAlignGUI.pro index 0efc5d6e9..7da482297 100644 --- a/gui/apps/coronAlignGUI/coronAlignGUI.pro +++ b/gui/apps/coronAlignGUI/coronAlignGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = coronAlignGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -22,7 +22,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.coronAlignGUI @@ -32,17 +32,17 @@ INCLUDEPATH += ../../lib ../../widgets/coronAlign HEADERS += ../../widgets/coronAlign/coronAlign.hpp \ ../../widgets/xWidgets/xWidget.hpp \ - ../../lib/multiIndiManager.hpp - -SOURCES += coronAlignGUI_main.cpp - + ../../lib/multiIndiManager.hpp + +SOURCES += coronAlignGUI_main.cpp + FORMS += ../../widgets/coronAlign/coronAlign.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/magaox.qrc +RESOURCES += ../../resources/magaox.qrc -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/dmCtrlGUI/dmCtrlGUI.pro b/gui/apps/dmCtrlGUI/dmCtrlGUI.pro index 477f19f3c..c9fb25c45 100644 --- a/gui/apps/dmCtrlGUI/dmCtrlGUI.pro +++ b/gui/apps/dmCtrlGUI/dmCtrlGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = dmCtrlGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -22,7 +22,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.dmCtrlGUI @@ -35,17 +35,17 @@ HEADERS += ../../widgets/dmCtrl/dmCtrl.hpp \ ../../widgets/xWidgets/statusLabel.hpp \ ../../widgets/xWidgets/fsmDisplay.hpp \ ../../lib/multiIndiManager.hpp - -SOURCES += dmCtrlGUI_main.cpp + +SOURCES += dmCtrlGUI_main.cpp #\ # ../../widgets/dmCtrl/dmCtrl.cpp \ - + FORMS += ../../widgets/dmCtrl/dmCtrl.ui \ ../../widgets/xWidgets/fsmDisplay.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/dmModeGUI/dmModeGUI.pro b/gui/apps/dmModeGUI/dmModeGUI.pro index 4d9d269d4..781dded3e 100644 --- a/gui/apps/dmModeGUI/dmModeGUI.pro +++ b/gui/apps/dmModeGUI/dmModeGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = dmModeGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -21,7 +21,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.dmModeGUI @@ -32,14 +32,14 @@ INCLUDEPATH += ../../lib ../../widgets/dmMode HEADERS += ../../widgets/dmMode/dmMode.hpp \ ../../widgets/xWidgets/xWidget.hpp \ ../../lib/multiIndiManager.hpp - + SOURCES += dmModeGUI_main.cpp - + FORMS += ../../widgets/dmMode/dmMode.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ - ../../../INDI/liblilxml/liblilxml.a + ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/loopCtrlGUI/loopCtrlGUI.pro b/gui/apps/loopCtrlGUI/loopCtrlGUI.pro index 7ddd2df25..eb12af847 100644 --- a/gui/apps/loopCtrlGUI/loopCtrlGUI.pro +++ b/gui/apps/loopCtrlGUI/loopCtrlGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = loopCtrlGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -23,7 +23,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.loopCtrlGUI @@ -38,19 +38,19 @@ HEADERS += ../../widgets/loopCtrl/loopCtrl.hpp \ ../../widgets/xWidgets/statusEntry.hpp \ ../../widgets/xWidgets/toggleSlider.hpp \ ../../lib/multiIndiManager.hpp - -SOURCES += loopCtrlGUI_main.cpp + +SOURCES += loopCtrlGUI_main.cpp #\ # ../../widgets/loopCtrl/loopCtrl.cpp \ - + FORMS += ../../widgets/loopCtrl/loopCtrl.ui \ ../../widgets/xWidgets/gainCtrl.ui \ ../../widgets/xWidgets/statusEntry.ui \ ../../widgets/xWidgets/toggleSlider.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/offloadCtrlGUI/offloadCtrlGUI.pro b/gui/apps/offloadCtrlGUI/offloadCtrlGUI.pro index 038aaf7df..43ff260a3 100644 --- a/gui/apps/offloadCtrlGUI/offloadCtrlGUI.pro +++ b/gui/apps/offloadCtrlGUI/offloadCtrlGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = offloadCtrlGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -22,7 +22,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.offloadCtrlGUI @@ -49,6 +49,6 @@ FORMS += ../../widgets/offloadCtrl/offloadCtrl.ui \ LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/pupilGuideGUI/pupilGuideGUI.pro b/gui/apps/pupilGuideGUI/pupilGuideGUI.pro index 8cc9483d2..2989d3f7c 100644 --- a/gui/apps/pupilGuideGUI/pupilGuideGUI.pro +++ b/gui/apps/pupilGuideGUI/pupilGuideGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = pupilGuideGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -22,7 +22,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.pupilGuideGUI @@ -36,19 +36,19 @@ HEADERS += ../../widgets/pupilGuide/pupilGuide.hpp \ ../../widgets/xWidgets/statusEntry.hpp \ ../../widgets/xWidgets/statusLabel.hpp \ ../../widgets/xWidgets/fsmDisplay.hpp \ - ../../lib/multiIndiManager.hpp - -SOURCES += pupilGuideGUI_main.cpp - + ../../lib/multiIndiManager.hpp + +SOURCES += pupilGuideGUI_main.cpp + FORMS += ../../widgets/pupilGuide/pupilGuide.ui \ ../../widgets/xWidgets/statusEntry.ui \ ../../widgets/xWidgets/fsmDisplay.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/magaox.qrc +RESOURCES += ../../resources/magaox.qrc -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/pwr/pwrGUI.pro b/gui/apps/pwr/pwrGUI.pro index 1c8dbfb69..e34988497 100644 --- a/gui/apps/pwr/pwrGUI.pro +++ b/gui/apps/pwr/pwrGUI.pro @@ -25,10 +25,6 @@ exists( $$(CONDA_PREFIX)/include ) { exists( $$(CONDA_PREFIX)/lib ) { INCLUDEPATH += $$(CONDA_PREFIX)/lib } -exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib -} - MAKEFILE = makefile.pwrGUI diff --git a/gui/apps/roiGUI/roiGUI.pro b/gui/apps/roiGUI/roiGUI.pro index 9510cf6d7..45849f6ba 100644 --- a/gui/apps/roiGUI/roiGUI.pro +++ b/gui/apps/roiGUI/roiGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = roiGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -22,7 +22,7 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.roiGUI @@ -37,16 +37,16 @@ HEADERS += ../../widgets/xWidgets/xWidget.hpp \ ../../lib/multiIndiSubscriber.hpp ../../lib/multiIndiPublisher.hpp ../../lib/multiIndiManager.hpp - -SOURCES += roiGUI_main.cpp + +SOURCES += roiGUI_main.cpp #\ # ../../widgets/roi/roi.cpp \ - + FORMS += ../../widgets/roi/roi.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets diff --git a/gui/apps/ttmGUI/ttmGUI.pro b/gui/apps/ttmGUI/ttmGUI.pro index 061138441..30c6da10c 100644 --- a/gui/apps/ttmGUI/ttmGUI.pro +++ b/gui/apps/ttmGUI/ttmGUI.pro @@ -4,8 +4,8 @@ TEMPLATE = app TARGET = ttmGUI -DESTDIR = bin/ -DEPENDPATH += ./ ../../lib +DESTDIR = bin/ +DEPENDPATH += ./ ../../lib MOC_DIR = moc/ OBJECTS_DIR = obj/ @@ -22,13 +22,13 @@ exists( $$(CONDA_PREFIX)/include ) { INCLUDEPATH += $$(CONDA_PREFIX)/include } exists( $$(CONDA_PREFIX)/lib ) { - LIBPATH += $$(CONDA_PREFIX)/lib + INCLUDEPATH += $$(CONDA_PREFIX)/lib } MAKEFILE = makefile.ttmGUI # Input -INCLUDEPATH += ../../lib ../../lib ../../widgets +INCLUDEPATH += ../../lib ../../lib ../../widgets HEADERS += ../../widgets/ttm/ttm.hpp \ ../../widgets/xWidgets/xWidget.hpp \ @@ -37,18 +37,18 @@ HEADERS += ../../widgets/ttm/ttm.hpp \ ../../widgets/xWidgets/statusLabel.hpp \ ../../widgets/xWidgets/statusLineEdit.hpp \ ../../lib/multiIndiManager.hpp - -SOURCES += ttmGUI_main.cpp + +SOURCES += ttmGUI_main.cpp #\ # ../../widgets/ttm/ttm.cpp \ - + FORMS += ../../widgets/ttm/ttm.ui \ ../../widgets/xWidgets/statusEntry.ui \ ../../widgets/xWidgets/fsmDisplay.ui - + LIBS += ../../../INDI/libcommon/libcommon.a \ ../../../INDI/liblilxml/liblilxml.a -RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc +RESOURCES += ../../resources/MagAOXStyleSheets/MagAOXStyle.qrc QT += widgets