cellects 0.3.2__tar.gz → 0.3.7__tar.gz

{cellects-0.3.2 → cellects-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cellects
-Version: 0.3.2
+Version: 0.3.7
 Summary: Cell Expansion Computer Tracking Software.
 Author: Aurèle Boussard
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -748,7 +748,7 @@ easy installation and user-friendly interface.
 
 ---
 
-## 🚀 Installation (Short version)
+## Installation (Short version)
 Install using our Windows installer: [Cellects_installer.exe](https://github.com/Aurele-B/Cellects/releases/)
 
 Or, install via pip:
@@ -759,15 +759,15 @@ Any difficulties? follow our [complete installation tutorial](https://aurele-b.g
 
 ---
 
-## 🎯 Quick Start
+## Quick Start
 Run in terminal:
 ```bash
-Cellects
+cellects
 ```
 
 ---
 
-## 📚 Documentation
+## Documentation
 
 Cellects' workflow is described in a [complete documentation](https://aurele-b.github.io/Cellects/). It includes:
 - [**What is Cellects**](https://aurele-b.github.io/Cellects/what-is-cellects/): Purpose of the software, usable data and introduction of its user manual
@@ -779,7 +779,7 @@ Cellects' workflow is described in a [complete documentation](https://aurele-b.g
 
 ---
 
-## 🧪 Use Cases
+## Use Cases
 
 See [use cases](https://aurele-b.github.io/Cellects/use-cases/) for real-world examples:
 - Automated Physarum polycephalum tracking using GUI
@@ -788,7 +788,7 @@ See [use cases](https://aurele-b.github.io/Cellects/use-cases/) for real-world e
 
 ---
 
-## 🛠 Contributing
+## Contributing
 
 We welcome contributions!  
 1. Fork the repository and create a new branch.
@@ -798,7 +798,7 @@ For developer workflows, see [**Contributing**](https://aurele-b.github.io/Celle
 
 ---
 
-## 📌 License & Citation
+## License & Citation
 
 GNU GPL3 License (see [LICENSE](https://github.com/Aurele-B/cellects/blob/main/LICENSE)).
 
@@ -816,10 +816,11 @@ To cite Cellects, use:
 
 ---
 
-## 🧪 Testing
+## Testing
 
 Run unit tests with:
 ```bash
+pip install -e ".[test]"
 pytest
 ```
 

{cellects-0.3.2 → cellects-0.3.7}/README.md

@@ -28,7 +28,7 @@ easy installation and user-friendly interface.
 
 ---
 
-## 🚀 Installation (Short version)
+## Installation (Short version)
 Install using our Windows installer: [Cellects_installer.exe](https://github.com/Aurele-B/Cellects/releases/)
 
 Or, install via pip:
@@ -39,15 +39,15 @@ Any difficulties? follow our [complete installation tutorial](https://aurele-b.g
 
 ---
 
-## 🎯 Quick Start
+## Quick Start
 Run in terminal:
 ```bash
-Cellects
+cellects
 ```
 
 ---
 
-## 📚 Documentation
+## Documentation
 
 Cellects' workflow is described in a [complete documentation](https://aurele-b.github.io/Cellects/). It includes:
 - [**What is Cellects**](https://aurele-b.github.io/Cellects/what-is-cellects/): Purpose of the software, usable data and introduction of its user manual
@@ -59,7 +59,7 @@ Cellects' workflow is described in a [complete documentation](https://aurele-b.g
 
 ---
 
-## 🧪 Use Cases
+## Use Cases
 
 See [use cases](https://aurele-b.github.io/Cellects/use-cases/) for real-world examples:
 - Automated Physarum polycephalum tracking using GUI
@@ -68,7 +68,7 @@ See [use cases](https://aurele-b.github.io/Cellects/use-cases/) for real-world e
 
 ---
 
-## 🛠 Contributing
+## Contributing
 
 We welcome contributions!  
 1. Fork the repository and create a new branch.
@@ -78,7 +78,7 @@ For developer workflows, see [**Contributing**](https://aurele-b.github.io/Celle
 
 ---
 
-## 📌 License & Citation
+## License & Citation
 
 GNU GPL3 License (see [LICENSE](https://github.com/Aurele-B/cellects/blob/main/LICENSE)).
 
@@ -96,10 +96,11 @@ To cite Cellects, use:
 
 ---
 
-## 🧪 Testing
+## Testing
 
 Run unit tests with:
 ```bash
+pip install -e ".[test]"
 pytest
 ```
 

{cellects-0.3.2 → cellects-0.3.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cellects"
-version = "0.3.2"
+version = "0.3.7"
 description = "Cell Expansion Computer Tracking Software."
 readme = "README.md"
 license = { file = "LICENSE" }

{cellects-0.3.2 → cellects-0.3.7}/src/cellects/__main__.py

@@ -10,12 +10,12 @@ import sys
 import logging
 import coloredlogs
 from PySide6 import QtWidgets, QtGui
-from cellects.core.cellects_paths import ICONS_DIR
+from pathlib import Path
 
 if sys.platform.startswith('win'):
     try:
         import ctypes
-        ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID('company.app.1')
+        ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("cellects.app")
     except Exception as e:
         logging.getLogger(__name__).debug(f"Windows taskbar icon setup failed: {e}")
 
@@ -68,6 +68,10 @@ def run_cellects():
 
         # Set custom window icon for taskbar (platform-specific handling)
         icon = QtGui.QIcon()
+        if hasattr(sys, "_MEIPASS"):
+            ICONS_DIR = Path(sys._MEIPASS) / "icons"
+        else:
+            ICONS_DIR = Path(__file__).parent / "icons"
         platform_icon_path = (
             ICONS_DIR / "cellects_icon.ico" if sys.platform.startswith('win')
             else ICONS_DIR / "cellects_icon.icns"

{cellects-0.3.2 → cellects-0.3.7}/src/cellects/core/cellects_paths.py

@@ -24,7 +24,7 @@ REPO_ROOT = CELLECTS_DIR.parent.parent
 
 # Repo-level dirs
 DATA_DIR = REPO_ROOT / "data"
-EXPERIMENTS_DIR = DATA_DIR / "experiment"
+EXPERIMENTS_DIR = DATA_DIR / "single_experiment"
 TEST_DIR = REPO_ROOT / "tests"
 
 # Example packaged file

{cellects-0.3.2 → cellects-0.3.7}/src/cellects/core/script_based_run.py

@@ -35,7 +35,7 @@ def load_data(rgb_video: NDArray=None, pathway: str='', sample_number:int=None,
     po = ProgramOrganizer()
     if rgb_video is None:
         if len(pathway) == 0:
-            pathway = Path(os.getcwd() + "/data/experiment")
+            pathway = Path(os.getcwd() + "/data/single_experiment")
         po.all['global_pathway'] = pathway
         po.all['first_folder_sample_number'] = sample_number
         po.all['radical'] = radical
@@ -87,6 +87,10 @@ def run_one_video_analysis(po, with_video_in_ram: bool=False):
     l = [i, i + 1, po.vars, segment, False, show_seg, videos_already_in_ram]
     MA = MotionAnalysis(l)
     MA.get_descriptors_from_binary()
+    if os.path.isfile('colony_centroids1_20col_t20_y1000_x1000.csv'):
+        os.remove('colony_centroids1_20col_t20_y1000_x1000.csv')
+    if os.path.isfile('data/single_experiment/colony_centroids1_20col_t20_y1000_x1000.csv'):
+        os.remove('data/single_experiment/colony_centroids1_20col_t20_y1000_x1000.csv')
     # MA.detect_growth_transitions()
     # MA.networks_analysis(show_seg)
     # MA.study_cytoscillations(show_seg)

{cellects-0.3.2 → cellects-0.3.7}/src/cellects/gui/advanced_parameters.py

@@ -558,24 +558,25 @@ class AdvancedParameters(WindowType):
         self.right_col_layout.addWidget(self.edit_widget)
 
         # VIII/ Finalize layout and add the night mode option and the ok button
-        self.left_col_layout.addItem(self.vertical_space)
-        self.right_col_layout.addItem(self.vertical_space)
+        self.left_col_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.MinimumExpanding))
+        self.right_col_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.MinimumExpanding))
         self.left_col_widget.setLayout(self.left_col_layout)
         self.right_col_widget.setLayout(self.right_col_layout)
+        self.central_widget = QtWidgets.QWidget()
         self.central_layout = QtWidgets.QHBoxLayout()
-        self.central_layout.addItem(self.horizontal_space)
+        self.central_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.left_scroll_table.setWidget(self.left_col_widget)
         self.left_scroll_table.setWidgetResizable(True)
+        self.left_scroll_table.setParent(self.central_widget)
         self.central_layout.addWidget(self.left_scroll_table)
-        self.central_layout.addItem(self.horizontal_space)
+        self.central_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.right_scroll_table.setWidget(self.right_col_widget)
         self.right_scroll_table.setWidgetResizable(True)
+        self.right_scroll_table.setParent(self.central_widget)
         self.central_layout.addWidget(self.right_scroll_table)
-        self.central_layout.addItem(self.horizontal_space)
-        self.central_widget = QtWidgets.QWidget()
+        self.central_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.central_widget.setLayout(self.central_layout)
         self.layout.addWidget(self.central_widget)
-        # self.layout.addItem(self.vertical_space)
 
         # Last row
         self.last_row_layout = QtWidgets.QHBoxLayout()
@@ -595,7 +596,7 @@ class AdvancedParameters(WindowType):
         self.last_row_layout.addWidget(self.night_mode_cb)
         self.last_row_layout.addWidget(self.night_mode_label)
         self.last_row_layout.addWidget(self.reset_all_settings)
-        self.last_row_layout.addItem(self.horizontal_space)
+        self.last_row_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.last_row_layout.addWidget(self.message)
         self.last_row_layout.addWidget(self.cancel)
         self.last_row_layout.addWidget(self.ok)
@@ -746,15 +747,13 @@ class AdvancedParameters(WindowType):
         """
         self.edit_widget = QtWidgets.QWidget()
         self.edit_layout = QtWidgets.QVBoxLayout()
-        self.csc_table_widget = QtWidgets.QWidget()
-        self.csc_table_layout = QtWidgets.QVBoxLayout()
 
         # 2) Titles
         self.video_csc_label = FixedText(AP["Csc_for_video_analysis"]["label"] + ':',
                                          tip=AP["Csc_for_video_analysis"]["tips"],
                                          night_mode=self.parent().po.all['night_mode'])
         self.video_csc_label.setFixedHeight(30)
-        self.csc_table_layout.addWidget(self.video_csc_label)
+        self.edit_layout.addWidget(self.video_csc_label)
         self.both_csc_widget = QtWidgets.QWidget()
         self.both_csc_layout = QtWidgets.QHBoxLayout()
 
@@ -786,7 +785,7 @@ class AdvancedParameters(WindowType):
             self.row2[i].setVisible(False)
             self.row3[i].setVisible(False)
         self.first_csc_layout.setHorizontalSpacing(0)
-        self.first_csc_layout.addItem(self.horizontal_space, 0, 5, 3, 1)
+        self.first_csc_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum), 0, 5, 3, 1)
         self.first_csc_widget.setLayout(self.first_csc_layout)
         self.both_csc_layout.addWidget(self.first_csc_widget)
 
@@ -801,12 +800,12 @@ class AdvancedParameters(WindowType):
             self.row22[i].setVisible(False)
             self.row23[i].setVisible(False)
         self.second_csc_layout.setHorizontalSpacing(0)
-        self.second_csc_layout.addItem(self.horizontal_space, 0, 5, 3, 1)
+        self.second_csc_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum), 0, 5, 3, 1)
         self.second_csc_widget.setLayout(self.second_csc_layout)
-        self.both_csc_layout.addItem(self.horizontal_space)
+        self.both_csc_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.both_csc_layout.addWidget(self.second_csc_widget)
         self.both_csc_widget.setLayout(self.both_csc_layout)
-        self.csc_table_layout.addWidget(self.both_csc_widget)
+        self.edit_layout.addWidget(self.both_csc_widget)
 
         # 4) logical_operator
         self.logical_op_widget = QtWidgets.QWidget()
@@ -814,12 +813,12 @@ class AdvancedParameters(WindowType):
         self.logical_op_layout = QtWidgets.QHBoxLayout()
         self.logical_op_layout.addWidget(self.logical_operator_label)
         self.logical_op_layout.addWidget(self.logical_operator_between_combination_result)
-        self.logical_op_layout.addItem(self.horizontal_space)
+        self.logical_op_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.logical_operator_between_combination_result.setVisible(False)
         self.logical_operator_label.setVisible(False)
         self.logical_op_widget.setLayout(self.logical_op_layout)
         self.logical_op_widget.setFixedHeight(50)
-        self.csc_table_layout.addWidget(self.logical_op_widget)
+        self.edit_layout.addWidget(self.logical_op_widget)
 
         # 6) Open the more_than_2_colors row layout
         self.more_than_2_colors_widget = QtWidgets.QWidget()
@@ -843,15 +842,11 @@ class AdvancedParameters(WindowType):
         self.more_than_2_colors_layout.addWidget(self.more_than_two_colors)
         self.more_than_2_colors_layout.addWidget(self.more_than_two_colors_label)
         self.more_than_2_colors_layout.addWidget(self.distinct_colors_number)
-        self.more_than_2_colors_layout.addItem(self.horizontal_space)
+        self.more_than_2_colors_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.more_than_2_colors_widget.setLayout(self.more_than_2_colors_layout)
         self.more_than_2_colors_widget.setFixedHeight(50)
-        self.csc_table_layout.addWidget(self.more_than_2_colors_widget)
-        self.csc_table_layout.addItem(self.vertical_space)
-        self.csc_table_widget.setLayout(self.csc_table_layout)
-
-        self.edit_layout.addWidget(self.csc_table_widget)
-
+        self.edit_layout.addWidget(self.more_than_2_colors_widget)
+        self.edit_layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.MinimumExpanding))
         self.edit_widget.setLayout(self.edit_layout)
 
     def one_csc_editing(self):
@@ -1303,16 +1298,10 @@ class AdvancedParameters(WindowType):
             if not are_dicts_equal:
                 self.parent().po.find_if_lighter_background()
 
-        if not self.parent().thread['SaveAllVars'].isRunning():
-            self.parent().thread['SaveAllVars'].start()
+        if not self.parent().thread_dict['SaveAllVars'].isRunning():
+            self.parent().thread_dict['SaveAllVars'].start()
 
         if self.parent().last_is_first:
             self.parent().change_widget(0) # FirstWidget
         else:
             self.parent().change_widget(3) # ImageAnalysisWindow ThirdWidget
-    
-    def closeEvent(self, event):
-        """
-        Handle the close event for a QWidget.
-        """
-        event.accept

{cellects-0.3.2 → cellects-0.3.7}/src/cellects/gui/cellects.py

@@ -110,8 +110,8 @@ class CellectsMainWidget(QtWidgets.QStackedWidget):
 
         self.instantiate_widgets()
 
-        self.thread = {}
-        self.thread['SaveAllVars'] = SaveAllVarsThread(self)
+        self.thread_dict = {}
+        self.thread_dict['SaveAllVars'] = SaveAllVarsThread(self)
         self.change_widget(0)
         self.center()
 
@@ -192,9 +192,15 @@ class CellectsMainWidget(QtWidgets.QStackedWidget):
             QtWidgets.QMessageBox.No)
 
         if reply == QtWidgets.QMessageBox.Yes:
-            signal.signal(signal.SIGSEGV, signal.SIG_IGN)
+            for _, thread in self.imageanalysiswindow.thread_dict.items():
+                thread.wait()
+            for _, thread  in self.ifseveralfolderswindow.thread_dict.items():
+                thread.wait()
+            for _, thread  in self.videoanalysiswindow.thread_dict.items():
+                thread.wait()
+            for _, thread  in self.firstwindow.thread_dict.items():
+                thread.wait()
             logging.info("Closing main window.")
             event.accept()
-            self.close()
         else:
             event.ignore()

{cellects-0.3.2 → cellects-0.3.7}/src/cellects/gui/custom_widgets.py

@@ -16,9 +16,6 @@ print(font_names)
 "Baskerville" in font_names
 """
 
-# colorblind-friendly : rgb(42, 251, 97) , rgb(126, 85, 197)
-# titlesize = 40
-
 if os.name == 'nt':
     buttonfont = QFont("Century Gothic", 17, QFont.Bold)
     titlefont = f"Baskerville Old Face" #"40pt Baskerville Old Face"
@@ -60,6 +57,7 @@ class WindowType(QtWidgets.QWidget):
     def __init__(self, parent, night_mode=False):
         super().__init__()
 
+        self.thread_dict = {}
         self.setVisible(False)
         self.setParent(parent)
         self.frame = QtWidgets.QFrame(self)
@@ -67,10 +65,6 @@ class WindowType(QtWidgets.QWidget):
         self.display_image = None
         self.setFont(QFont(textfont, textsize, QFont.Medium))
         self.night_mode_switch(night_mode)
-        self.horizontal_space = QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding,
-                                              QtWidgets.QSizePolicy.Maximum)
-        self.vertical_space = QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Maximum,
-                                              QtWidgets.QSizePolicy.MinimumExpanding)
 
     def resizeEvent(self, event):
         '''
@@ -125,7 +119,7 @@ class MainTabsType(WindowType):
         self.main_tabs_layout.addWidget(self.video_tab)
         self.main_tabs_widget.setLayout(self.main_tabs_layout)
         self.Vlayout.addWidget(self.main_tabs_widget)
-        self.Vlayout.addItem(self.vertical_space)
+        self.Vlayout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.MinimumExpanding))
 
 
 class FullScreenImage(QtWidgets.QLabel):
@@ -134,10 +128,8 @@ class FullScreenImage(QtWidgets.QLabel):
         self.true_shape = image.shape
         self.max_height = screen_height
         self.max_width = screen_width
-        # self.im_size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
         self.im_size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding,
                                                     QtWidgets.QSizePolicy.MinimumExpanding)
-        # self.im_size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
         self.setSizePolicy(self.im_size_policy)
 
         self.height_width_ratio = image.shape[0] / image.shape[1]
@@ -149,10 +141,6 @@ class FullScreenImage(QtWidgets.QLabel):
             self.scaled_shape = [round(self.max_width * self.height_width_ratio), self.max_width]
         else:
             self.scaled_shape = [self.max_height, np.round(self.max_height / self.height_width_ratio)]
-        # self.setFixedHeight(self.scaled_shape[0])
-        # self.setFixedWidth(self.scaled_shape[1])
-        # self.setMaximumHeight(self.scaled_shape[0])
-        # self.setMaximumWidth(self.scaled_shape[1])
         self.setMinimumSize(self.scaled_shape[1], self.scaled_shape[0])
         self.setPixmap(QPixmap(image))
         self.adjustSize()
@@ -164,10 +152,8 @@ class InsertImage(QtWidgets.QLabel):
         self.true_shape = image.shape
         self.max_height = max_height
         self.max_width = max_width
-        # self.im_size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
         self.im_size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding,
                                                     QtWidgets.QSizePolicy.MinimumExpanding)
-        # self.im_size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
         self.setSizePolicy(self.im_size_policy)
 
         self.height_width_ratio = image.shape[0] / image.shape[1]
@@ -179,12 +165,8 @@ class InsertImage(QtWidgets.QLabel):
             self.scaled_shape = [round(self.max_width * self.height_width_ratio), self.max_width]
         else:
             self.scaled_shape = [self.max_height, np.round(self.max_height / self.height_width_ratio)]
-        # self.setFixedHeight(self.scaled_shape[0])
-        # self.setFixedWidth(self.scaled_shape[1])
         self.setMaximumHeight(self.scaled_shape[0])
         self.setMaximumWidth(self.scaled_shape[1])
-        # self.resize(self.scaled_shape[1], self.scaled_shape[0])
-        # self.setMinimumSize(self.scaled_shape[0], self.scaled_shape[1])
         self.setPixmap(QPixmap(image))
         self.adjustSize()
 
@@ -200,18 +182,8 @@ class InsertImage(QtWidgets.QLabel):
             self.scaled_shape = [int(np.round(self.max_width * self.height_width_ratio)), self.max_width]
         else:
             self.scaled_shape = [self.max_height, int(np.round(self.max_height / self.height_width_ratio))]
-        # self.setFixedHeight(self.scaled_shape[0])
-        # self.setFixedWidth(self.scaled_shape[1])
         self.setMaximumHeight(self.scaled_shape[0])
         self.setMaximumWidth(self.scaled_shape[1])
-        # self.resize(self.scaled_shape[1], self.scaled_shape[0])
-
-        # if text is not None:
-        #     pass
-            # pos = QtCore.QPoint(50, 50)
-            # painter = QPainter(self)
-            # painter.drawText(pos, text)
-            # painter.setPen(QColor(color, color, color))
         self.setPixmap(QPixmap(image))
 
     def update_image_scaling_factors(self):
@@ -233,19 +205,9 @@ class PButton(QtWidgets.QPushButton):
         self.setToolTip(tip)
         self.night_mode_switch(night_mode)
         self.setFont(buttonfont)
-        # self.setStyleSheet("background-color: rgb(50,50,65);\n" #50,50,65 150, 150, 150 153, 204, 205    122, 0, 61   30, 144, 220
-        #                         "border-color: rgb(255, 255, 255);\n"
-        #                         "color: rgb(255, 255, 255);\n"
-        #                         "font: 17pt \"Segoe UI Semibold\";\n"
-        #                         "border : 1px solid rgb(255, 255, 255);"
-        #                         "border-radius : 12px;\n"
-        #                    )
         self.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         self.setFixedWidth(len(text)*15 + 25)
         self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
-        # if fade:
-        #     # self.mouseMoveEvent.connect(self.fade)
-        #     self.clicked.connect(self.fade)
 
     def night_mode_switch(self, night_mode):
         if night_mode:
@@ -322,7 +284,6 @@ class Spinbox(QtWidgets.QWidget):
 
         self._line_edit = QtWidgets.QLineEdit(self)
         self._line_edit.setAlignment(QtCore.Qt.AlignLeft)
-        # self._line_edit.setAlignment(QtCore.Qt.AlignRight)
         self._layout.addWidget(self._line_edit)
 
         button_layout = QtWidgets.QVBoxLayout()
@@ -354,17 +315,11 @@ class Spinbox(QtWidgets.QWidget):
         self.decimals = decimals
         if decimals is not None:
             self.setDecimals(decimals)
-            # self.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
         else:
             self.setDecimals(0)
         self.setSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
         self.setFont(QFont(textfont, textsize, QFont.Medium))
         self.night_mode_switch(night_mode)
-        # self.setStyleSheet("""
-        #     QSpinBox::up-button { subcontrol-origin: border; subcontrol-position: top right; width: 16px; }
-        #     QSpinBox::down-button { subcontrol-origin: border; subcontrol-position: bottom right; width: 16px; }
-        #     QSpinBox::up-arrow, QSpinBox::down-arrow { width: 10px; height: 10px; }
-        # """)
 
         self.setStyleSheet("""
             QPushButton {
@@ -479,18 +434,9 @@ class Combobox(QtWidgets.QComboBox):
         if current_idx is not None:
             self.setCurrentIndex(current_idx)
         self.setFixedHeight(30)
-        #self.adjustSize()
-        #max([len(item) for item in items_list])
-        # width = self.minimumSizeHint().width()
-        # self.setMinimumWidth(width+30)
-        # self.setFixedWidth(self.minimumSizeHint().width() + 5)
-
-        # self.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
         self.setSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
         self.night_mode_switch(night_mode)
 
-        # self.setStyleSheet("QComboBox::drop - down:!editable{background: transparent; border: none;};"
-        #                    "QComboBox {border: '1px solid rgb(127, 127, 127)'; border-radius: 4px}")
         self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
     def night_mode_switch(self, night_mode):
         if night_mode:
@@ -543,11 +489,8 @@ class EditText(QtWidgets.QLineEdit):
         self.setText(str(text))
         self.night_mode_switch(night_mode)
         self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
-        # self.setAttribute(QtCore.Qt.WA_MacShowFocusRect, 0)
 
     def night_mode_switch(self, night_mode):
-        # self.setStyleSheet("border: %s" % bordercolor)
-        # self.setStyleSheet("border: %s" % night_border_color)
         if night_mode:
             self.setStyleSheet(
                 "background-color: %s; color: %s; font: %s; border-bottom: %s; border-top: %s" % (
@@ -557,26 +500,6 @@ class EditText(QtWidgets.QLineEdit):
                 "background-color: %s; color: %s; font: %s; border-bottom: %s; border-top: %s" % (
                     backgroundcolor, textColor, f"{textsize}pt {textfont};", f"1px solid grey", f"1px dotted #adadad"))
 
-            # "QLineEdit"
-            #           "{"
-            #           "border : 5px solid black;"
-            #           "}"
-            #           "QLineEdit::hover"
-            #           "{"
-            #           "border-color : red green blue yellow"
-            #           "}")
-
-        # if night_mode:
-        #     self.setStyleSheet(
-        #         "background-color: %s; color: %s; font: %s; border-color: %s; selection-color: %s; alternate-border-color: %s; selection-background-color: %s" % (
-        #             night_background_color, night_text_Color, f"{textsize}pt {textfont};", night_border_color,
-        #             night_selection_color, night_selection_border_color, night_selection_background_color))
-        # else:
-        #     self.setStyleSheet(
-        #         "background-color: %s; color: %s; font: %s; border-color: %s; selection-color: %s; alternate-border-color: %s;  selection-background-color: %s" % (
-        #             backgroundcolor, textColor, f"{textsize}pt {textfont};", bordercolor, selectioncolor,
-        #             selectionbordercolor, selectionbackgroundcolor))
-
 
 class FixedText(QtWidgets.QLabel):
     def __init__(self, text, police=None, halign='l', valign="c", tip=None, night_mode=False):
@@ -597,18 +520,8 @@ class FixedText(QtWidgets.QLabel):
 
         if police is not None:
             if police > 23:
-                # self.setStyleSheet("font: %s; margin-bottom: %s" % (titlefont, "30%;"))
-
-                # self.night_mode_switch(night_mode, titlefont)
                 self.night_mode_switch(night_mode, f"{police}pt {titlefont}")
-
-                # self.setFont(titlefont)
-                # self.setStyleSheet("margin-bottom: 30%;\n")
                 self.setMargin(2)
-            # else:
-            #     self.night_mode_switch(night_mode, f"{police}pt {textfont}")
-                # self.night_mode_switch(night_mode, QFont(textfont, police + 2, QFont.Medium))
-                # self.setFont(QFont(textfont, police + 2, QFont.Medium))
 
         else:
             self.setFont(QFont(textfont, textsize + 2, QFont.Medium))
@@ -624,12 +537,6 @@ class FixedText(QtWidgets.QLabel):
                                                                                   border: black solid 1px
                                                                                   }""")
 
-            # self.setStyleSheet("""QToolTip {
-            #                               background-color: rgb(150, 150, 150);
-            #                               color: rgb(1, 1, 1);
-            #                               border: black solid 1px
-            #                               }""")
-
     def night_mode_switch(self, night_mode, font):
         if night_mode:
             self.setStyleSheet("font: %s; color: %s; margin-bottom: %s" % (font, night_text_Color, "30%"))
@@ -644,7 +551,6 @@ class LineWidget(QtWidgets.QWidget):
         self.line = QtWidgets.QFrame()
         if ori == "h":
             self.line.setFrameShape(QtWidgets.QFrame.HLine)
-            # self.setFrameShadow(QtWidgets.QFrame.Sunken)
         else:
             self.line.setFrameShape(QtWidgets.QFrame.VLine)
         self.night_mode_switch(night_mode)
@@ -652,11 +558,9 @@ class LineWidget(QtWidgets.QWidget):
             size = [1, 4]
         self.line.setFixedHeight(size[0])
         self.line.setFixedWidth(size[1])
-        horizontal_space = QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding,
-                                                      QtWidgets.QSizePolicy.Maximum)
-        self.layout.addItem(horizontal_space)
+        self.layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.layout.addWidget(self.line)
-        self.layout.addItem(horizontal_space)
+        self.layout.addItem(QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum))
         self.setLayout(self.layout)
 
     def night_mode_switch(self, night_mode):
@@ -685,12 +589,9 @@ class MainTabsWidget(QtWidgets.QPushButton):
         self.state = "not_in_use"  # States: "not_in_use", "in_use", "not_usable"
         self.setFont(buttonfont)
 
-
         # Set basic properties
         self.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        # self.setFixedWidth(len(text)*15 + 25)
         self.setFixedHeight(35)
-        # self.setMinimumWidth(80)
         self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
 
         self.night_mode_switch(night_mode)