diff --git a/README.md b/README.md index 8e79224..11a3f28 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,9 @@ The software can be installed by running: ```bash conda create --name arcjetcv conda-forge::arcjetcv ``` +#### Note for macOS Users: + +Please ensure you use the osx-64 channel from Conda Forge when installing arcjetCV. Currently, arcjetCV is not available on the osx-arm64 channel. ### Windows Users and Developers diff --git a/arcjetCV/gui/arcjetCV_gui.py b/arcjetCV/gui/arcjetCV_gui.py index b9cefdf..d1cb5a7 100644 --- a/arcjetCV/gui/arcjetCV_gui.py +++ b/arcjetCV/gui/arcjetCV_gui.py @@ -15,7 +15,6 @@ class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.setWindowIcon(QtGui.QIcon("gui/logo/arcjetCV_logo_.png")) MainWindow.resize(800, 500) self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") @@ -451,7 +450,7 @@ def setupUi(self, MainWindow): ) self.spinBox_frame_skips = QtWidgets.QSpinBox(self.groupBox) self.spinBox_frame_skips.setMinimum(1) - self.spinBox_frame_skips.setMaximum(200) + self.spinBox_frame_skips.setMaximum(500) self.spinBox_frame_skips.setProperty("value", 5) self.spinBox_frame_skips.setObjectName("spinBox_frame_skips") self.formLayout_5.setWidget( @@ -587,7 +586,7 @@ def setupUi(self, MainWindow): ) self.doubleSpinBox_fps = QtWidgets.QDoubleSpinBox(self.tab_5) self.doubleSpinBox_fps.setMinimum(1.0) - self.doubleSpinBox_fps.setMaximum(120.0) + self.doubleSpinBox_fps.setMaximum(12000.0) self.doubleSpinBox_fps.setProperty("value", 30.0) self.doubleSpinBox_fps.setObjectName("doubleSpinBox_fps") self.formLayout_3.setWidget( diff --git a/arcjetCV/gui/logo/arcjetCV_logo_white.png b/arcjetCV/gui/logo/arcjetCV_logo_white.png index aaab1c6..f6b7d53 100644 Binary files a/arcjetCV/gui/logo/arcjetCV_logo_white.png and b/arcjetCV/gui/logo/arcjetCV_logo_white.png differ diff --git a/arcjetCV/gui/logo/arcjetCV_logo_white_.png b/arcjetCV/gui/logo/arcjetCV_logo_white_.png deleted file mode 100644 index f6b7d53..0000000 Binary files a/arcjetCV/gui/logo/arcjetCV_logo_white_.png and /dev/null differ diff --git a/arcjetCV/gui/main.py b/arcjetCV/gui/main.py index 499f0dd..2444136 100644 --- a/arcjetCV/gui/main.py +++ b/arcjetCV/gui/main.py @@ -3,13 +3,18 @@ No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER, CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE. FURTHER, GOVERNMENT AGENCY DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS." Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT. IF RECIPIENT'S USE OF THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES, EXPENSES OR LOSSES ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING FROM, RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE UNITED STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE, UNILATERAL TERMINATION OF THIS AGREEMENT. """ + from PySide6.QtWidgets import QApplication +from PySide6.QtGui import QIcon import sys from arcjetCV.gui.main_window import MainWindow + def main(): app = QApplication(sys.argv) window = MainWindow() + path='logo/arcjetCV_logo_.png' + app.setWindowIcon(QIcon(path)) window.show() sys.exit(app.exec()) diff --git a/env/arcjetCV_env_cpu.yml b/env/arcjetCV_env_cpu.yml index 2042dd8..971328a 100644 --- a/env/arcjetCV_env_cpu.yml +++ b/env/arcjetCV_env_cpu.yml @@ -7,7 +7,6 @@ dependencies: - python - pip - pyside6 - - ocl-icd-system - opencv - matplotlib - pandas @@ -15,4 +14,4 @@ dependencies: - scikit-learn - segmentation-models-pytorch - pytorch - - torchvision + - torchvision \ No newline at end of file