Reverted changes to gui apps, since they seem to have been addressed …

…in the main repo.
uasal · Dec 14, 2023 · 17b3389 · 17b3389
1 parent e30bf29
commit 17b3389
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 86 deletions.
diff --git a/Makefile b/Makefile
@@ -228,7 +228,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
@@ -288,7 +288,7 @@ test: tests_clean
 
 tests_clean:
 	cd tests; ${MAKE} clean || exit 1;
-
+	
 .PHONY: doc
 doc:
 	doxygen doc/config/Doxyfile.libMagAOX

diff --git 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,13 +24,13 @@ exists( $$(CONDA_PREFIX)/include ) {
     INCLUDEPATH += $$(CONDA_PREFIX)/include
 }
 exists( $$(CONDA_PREFIX)/lib ) {
-    LIBPATH += $$(CONDA_PREFIX)/lib
+    INCLUDEPATH += $$(CONDA_PREFIX)/lib
 }
 
 MAKEFILE = makefile.cameraGUI
 
 # Input
-INCLUDEPATH += ../../lib ../../widgets
+INCLUDEPATH += ../../lib ../../widgets 
 
 HEADERS += ../../widgets/camera/camera.hpp \
            ../../widgets/xWidgets/xWidget.hpp \
@@ -46,9 +46,9 @@ HEADERS += ../../widgets/camera/camera.hpp \
            ../../widgets/roi/roi.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 \
@@ -57,10 +57,10 @@ FORMS += ../../widgets/camera/camera.ui \
          ../../widgets/roi/roi.ui \
          ../../widgets/camera/shutterStatus.ui \
          ../../widgets/xWidgets/selectionSw.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/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
@@ -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
@@ -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
@@ -4,8 +4,8 @@
 
 TEMPLATE = app
 TARGET = loopCtrlGUI
-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.loopCtrlGUI
@@ -37,19 +37,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
@@ -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
@@ -31,17 +31,17 @@ MAKEFILE = makefile.offloadCtrlGUI
 INCLUDEPATH += ../../lib ../../widgets/offloadCtrl
 
 HEADERS += ../../widgets/offloadCtrl/offloadCtrl.hpp \
-           ../../widgets/xWidgets/xWidget.hpp
-
+           ../../widgets/xWidgets/xWidget.hpp 
+           
 SOURCES += offloadCtrlGUI_main.cpp \
            ../../widgets/offloadCtrl/offloadCtrl.cpp
-
-
+        
+           
 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
@@ -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
@@ -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
@@ -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