From 2c32f16944ab3fc093254b80e62450f7c3a29a8c Mon Sep 17 00:00:00 2001 From: Alexandre Quintart Date: Wed, 8 May 2024 10:20:42 +0200 Subject: [PATCH] added the logo to the dock --- arcjetCV/gui/arcjetCV_gui.py | 1 - arcjetCV/gui/main.py | 5 +++++ arcjetCV/gui/main_window.py | 2 +- env/arcjetCV_env_cpu.yml | 3 +-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arcjetCV/gui/arcjetCV_gui.py b/arcjetCV/gui/arcjetCV_gui.py index b9cefdf..8a6893e 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") 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/arcjetCV/gui/main_window.py b/arcjetCV/gui/main_window.py index 97a0aaa..c7be8fb 100644 --- a/arcjetCV/gui/main_window.py +++ b/arcjetCV/gui/main_window.py @@ -37,7 +37,7 @@ def __init__(self): # Set the application icon self.logo_path = os.path.join( - Path(__file__).parent.absolute(), "logo/arcjetCV_logo_white.png" + Path(__file__).parent.absolute(), "logo/arcjetCV_logo_white_.png" ) self.setWindowIcon(QIcon(self.logo_path)) 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