MoleditPy-linux 4.8.2__tar.gz → 4.9.0__tar.gz

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy-linux
-Version: 4.8.2
+Version: 4.9.0
 Summary: A cross-platform, simple, and intuitive molecular structure editor built in Python. It allows 2D molecular drawing and 3D structure visualization. It supports exporting structure files for input to DFT calculation software.
 Author-email: HiroYokoyama <titech.yoko.hiro@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -709,7 +709,7 @@ Dynamic: license-file
 [![Python Versions](https://img.shields.io/pypi/pyversions/MoleditPy.svg)](https://pypi.org/project/MoleditPy/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Build Status](https://github.com/HiroYokoyama/python_molecular_editor/actions/workflows/tests.yml/badge.svg)](https://github.com/HiroYokoyama/python_molecular_editor/actions)
-[![Overall Coverage](https://img.shields.io/badge/coverage->80%25-green)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/coverage_report.md)
+[![codecov](https://codecov.io/gh/HiroYokoyama/python_molecular_editor/graph/badge.svg)](https://codecov.io/gh/HiroYokoyama/python_molecular_editor)
 [![GUI Status](https://img.shields.io/badge/GUI-Manually_Verified-blue)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/MANUAL_CHECKLIST.md)
 [![Pylint Score](https://img.shields.io/badge/pylint->9%2F10-brightgreen)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/pylint-score.txt)
 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/moleditpy?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/moleditpy)

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/README.md

@@ -6,7 +6,7 @@
 [![Python Versions](https://img.shields.io/pypi/pyversions/MoleditPy.svg)](https://pypi.org/project/MoleditPy/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Build Status](https://github.com/HiroYokoyama/python_molecular_editor/actions/workflows/tests.yml/badge.svg)](https://github.com/HiroYokoyama/python_molecular_editor/actions)
-[![Overall Coverage](https://img.shields.io/badge/coverage->80%25-green)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/coverage_report.md)
+[![codecov](https://codecov.io/gh/HiroYokoyama/python_molecular_editor/graph/badge.svg)](https://codecov.io/gh/HiroYokoyama/python_molecular_editor)
 [![GUI Status](https://img.shields.io/badge/GUI-Manually_Verified-blue)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/MANUAL_CHECKLIST.md)
 [![Pylint Score](https://img.shields.io/badge/pylint->9%2F10-brightgreen)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/pylint-score.txt)
 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/moleditpy?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/moleditpy)

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "MoleditPy-linux"
 
-version = "4.8.2"
+version = "4.9.0"
 
 license = {file = "LICENSE"}
 

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/MoleditPy_linux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy-linux
-Version: 4.8.2
+Version: 4.9.0
 Summary: A cross-platform, simple, and intuitive molecular structure editor built in Python. It allows 2D molecular drawing and 3D structure visualization. It supports exporting structure files for input to DFT calculation software.
 Author-email: HiroYokoyama <titech.yoko.hiro@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -709,7 +709,7 @@ Dynamic: license-file
 [![Python Versions](https://img.shields.io/pypi/pyversions/MoleditPy.svg)](https://pypi.org/project/MoleditPy/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Build Status](https://github.com/HiroYokoyama/python_molecular_editor/actions/workflows/tests.yml/badge.svg)](https://github.com/HiroYokoyama/python_molecular_editor/actions)
-[![Overall Coverage](https://img.shields.io/badge/coverage->80%25-green)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/coverage_report.md)
+[![codecov](https://codecov.io/gh/HiroYokoyama/python_molecular_editor/graph/badge.svg)](https://codecov.io/gh/HiroYokoyama/python_molecular_editor)
 [![GUI Status](https://img.shields.io/badge/GUI-Manually_Verified-blue)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/MANUAL_CHECKLIST.md)
 [![Pylint Score](https://img.shields.io/badge/pylint->9%2F10-brightgreen)](https://github.com/HiroYokoyama/python_molecular_editor/blob/main/tests/pylint-score.txt)
 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/moleditpy?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/moleditpy)

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/MoleditPy_linux.egg-info/SOURCES.txt

@@ -69,6 +69,7 @@ src/moleditpy_linux/ui/user_template_dialog.py
 src/moleditpy_linux/ui/view_3d_logic.py
 src/moleditpy_linux/ui/zoomable_view.py
 src/moleditpy_linux/ui/settings_tabs/__init__.py
+src/moleditpy_linux/ui/settings_tabs/settings_2d_cleanup_tab.py
 src/moleditpy_linux/ui/settings_tabs/settings_2d_tab.py
 src/moleditpy_linux/ui/settings_tabs/settings_3d_tabs.py
 src/moleditpy_linux/ui/settings_tabs/settings_other_tab.py

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/core/mol_geometry.py

@@ -591,12 +591,63 @@ def _identify_problems_rdkit(
         return None
 
 
-def optimize_2d_coords(mol: Chem.Mol) -> Dict[int, Tuple[float, float]]:
+_TARGET_BOND_LENGTH = 1.5  # matches RDKit's default (non-CoordGen) bond length
+
+
+def _normalize_bond_length(mol: Chem.Mol, target_length: float) -> None:
+    """Rescale a molecule's 2D conformer so its average bond length matches target_length."""
+    if mol.GetNumBonds() == 0:
+        return
+    conf = mol.GetConformer()
+    total_len = 0.0
+    for bond in mol.GetBonds():
+        p1 = conf.GetAtomPosition(bond.GetBeginAtomIdx())
+        p2 = conf.GetAtomPosition(bond.GetEndAtomIdx())
+        total_len += ((p1.x - p2.x) ** 2 + (p1.y - p2.y) ** 2) ** 0.5
+    avg_len = total_len / mol.GetNumBonds()
+    if avg_len <= 1e-6:
+        return
+    factor = target_length / avg_len
+    for i in range(mol.GetNumAtoms()):
+        pos = conf.GetAtomPosition(i)
+        conf.SetAtomPosition(i, (pos.x * factor, pos.y * factor, pos.z))
+
+
+def optimize_2d_coords(
+    mol: Chem.Mol,
+    prefer_coordgen: bool = False,
+    canonical_orientation: bool = True,
+    use_ring_templates: bool = False,
+    straighten_bonds: bool = False,
+    avoid_clashes: bool = False,
+) -> Dict[int, Tuple[float, float]]:
     """Generate 2D coordinates using RDKit and return a map of (x, y) tuples."""
-    from rdkit.Chem import AllChem
+    from rdkit.Chem import rdDepictor
 
-    AllChem.Compute2DCoords(mol)
+    sample_kwargs = (
+        {"nFlipsPerSample": 3, "nSample": 200, "sampleSeed": 0xF00D}
+        if avoid_clashes
+        else {}
+    )
+
+    rdDepictor.SetPreferCoordGen(prefer_coordgen)
+    try:
+        rdDepictor.Compute2DCoords(
+            mol,
+            canonOrient=canonical_orientation,
+            useRingTemplates=use_ring_templates,
+            **sample_kwargs,  # type: ignore[arg-type]  # RDKit's generated overload differs by platform.
+        )
+        if straighten_bonds:
+            rdDepictor.StraightenDepiction(mol)
+    finally:
+        rdDepictor.SetPreferCoordGen(False)
+    # CoordGen and the default generator use different internal bond-length
+    # conventions (~1.0 vs ~1.5), so normalize here to keep the on-screen
+    # scale consistent regardless of which algorithm produced the layout.
+    _normalize_bond_length(mol, _TARGET_BOND_LENGTH)
     conf = mol.GetConformer()
+
     new_positions = {}
     for rdkit_atom in mol.GetAtoms():
         if rdkit_atom.HasProp("_original_atom_id"):

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/core/molecular_data.py

@@ -18,7 +18,7 @@ from rdkit import Chem
 from ..utils.constants import ANGSTROM_PER_PIXEL
 
 
-class PointTuple(tuple):
+class PointTuple(Tuple[float, ...]):
     """Backward-compatible tuple that allows .x() and .y() access like QPointF."""
 
     def x(self) -> float:

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/main.py

@@ -20,7 +20,7 @@ import sys
 import argparse
 import time
 import traceback
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Set
 
 from .utils.constants import VERSION
 
@@ -81,7 +81,7 @@ class _ErrorDialogHandler(logging.Handler):
         # signature -> monotonic timestamp of its last shown dialog.
         self._last_shown: Dict[str, float] = {}
         # Held so a non-blocking box is not garbage-collected before it closes.
-        self._open_boxes: set = set()
+        self._open_boxes: Set[QMessageBox] = set()
         self._log_path = log_path
 
     def emit(self, record: logging.LogRecord) -> None:

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/plugins/plugin_interface.py

@@ -27,7 +27,7 @@ class PluginContext:
     def add_menu_action(
         self,
         path: str,
-        callback: Callable,
+        callback: Callable[..., Any],
         text: Optional[str] = None,
         icon: Optional[str] = None,
         shortcut: Optional[str] = None,
@@ -57,8 +57,8 @@ class PluginContext:
     def register_menu_action(
         self,
         path: str,
-        text_or_callback: Union[str, Callable],
-        callback: Optional[Callable] = None,
+        text_or_callback: Union[str, Callable[..., Any]],
+        callback: Optional[Callable[..., Any]] = None,
         icon: Optional[str] = None,
         shortcut: Optional[str] = None,
     ) -> None:
@@ -76,7 +76,7 @@ class PluginContext:
     def add_plugin_menu(
         self,
         path: str,
-        callback: Callable,
+        callback: Callable[..., Any],
         text: Optional[str] = None,
         icon: Optional[str] = None,
         shortcut: Optional[str] = None,
@@ -103,7 +103,7 @@ class PluginContext:
 
     def add_toolbar_action(
         self,
-        callback: Callable,
+        callback: Callable[..., Any],
         text: str,
         icon: Optional[str] = None,
         tooltip: Optional[str] = None,
@@ -262,7 +262,7 @@ class PluginContext:
         if mw and hasattr(mw, "view_3d_manager") and mw.view_3d_manager.plotter:
             mw.view_3d_manager.plotter.reset_camera()
 
-    def add_export_action(self, label: str, callback: Callable) -> None:
+    def add_export_action(self, label: str, callback: Callable[..., Any]) -> None:
         """
         Register a custom export action.
 
@@ -303,7 +303,7 @@ class PluginContext:
             self._plugin_name, extension, callback, priority
         )
 
-    def add_analysis_tool(self, label: str, callback: Callable) -> None:
+    def add_analysis_tool(self, label: str, callback: Callable[..., Any]) -> None:
         """
         Register a tool in the Analysis menu.
 
@@ -313,7 +313,7 @@ class PluginContext:
         """
         self._manager.register_analysis_tool(self._plugin_name, label, callback)
 
-    def register_save_handler(self, callback: Callable[[], dict]) -> None:
+    def register_save_handler(self, callback: Callable[[], Dict[str, Any]]) -> None:
         """
         Register a callback to save state into the project file.
 
@@ -322,7 +322,7 @@ class PluginContext:
         """
         self._manager.register_save_handler(self._plugin_name, callback)
 
-    def register_load_handler(self, callback: Callable[[dict], None]) -> None:
+    def register_load_handler(self, callback: Callable[[Dict[str, Any]], None]) -> None:
         """
         Register a callback to restore state from the project file.
 
@@ -331,7 +331,9 @@ class PluginContext:
         """
         self._manager.register_load_handler(self._plugin_name, callback)
 
-    def register_3d_context_menu(self, callback: Callable, label: str) -> None:
+    def register_3d_context_menu(
+        self, callback: Callable[..., Any], label: str
+    ) -> None:
         """Deprecated: This method does nothing. Kept for backward compatibility."""
         import warnings
 

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/plugins/plugin_manager.py

@@ -92,8 +92,8 @@ class PluginManager:
         self.optimization_methods: Dict[str, Dict[str, Any]] = {}
         self.file_openers: Dict[str, List[Dict[str, Any]]] = {}
         self.analysis_tools: List[Dict[str, Any]] = []
-        self.save_handlers: Dict[str, Callable] = {}
-        self.load_handlers: Dict[str, Callable] = {}
+        self.save_handlers: Dict[str, Callable[..., Any]] = {}
+        self.load_handlers: Dict[str, Callable[..., Any]] = {}
         self.custom_3d_styles: Dict[str, Dict[str, Any]] = {}
         self.document_reset_handlers: List[Dict[str, Any]] = []
         self.atom_drag_handlers: List[Dict[str, Any]] = []
@@ -447,7 +447,7 @@ class PluginManager:
         self,
         plugin_name: str,
         path: str,
-        callback: Callable,
+        callback: Callable[..., Any],
         text: str,
         icon: str,
         shortcut: str,
@@ -471,7 +471,12 @@ class PluginManager:
         )
 
     def register_toolbar_action(
-        self, plugin_name: str, callback: Callable, text: str, icon: str, tooltip: str
+        self,
+        plugin_name: str,
+        callback: Callable[..., Any],
+        text: str,
+        icon: str,
+        tooltip: str,
     ) -> None:
         """Register a plugin toolbar button with its callback and display metadata."""
         self.toolbar_actions.append(
@@ -485,7 +490,7 @@ class PluginManager:
         )
 
     def register_drop_handler(
-        self, plugin_name: str, callback: Callable, priority: int
+        self, plugin_name: str, callback: Callable[..., Any], priority: int
     ) -> None:
         """Register a drag-and-drop handler with a given priority."""
         self.drop_handlers.append(
@@ -495,7 +500,7 @@ class PluginManager:
         self.drop_handlers.sort(key=lambda x: x["priority"], reverse=True)
 
     def register_export_action(
-        self, plugin_name: str, label: str, callback: Callable
+        self, plugin_name: str, label: str, callback: Callable[..., Any]
     ) -> None:
         """Register a plugin export action with its label and callback."""
         self.export_actions.append(
@@ -503,7 +508,7 @@ class PluginManager:
         )
 
     def register_optimization_method(
-        self, plugin_name: str, method_name: str, callback: Callable
+        self, plugin_name: str, method_name: str, callback: Callable[..., Any]
     ) -> None:
         """Register a named 3D optimization method provided by a plugin."""
         method_key = method_name.upper()
@@ -520,7 +525,11 @@ class PluginManager:
             )
 
     def register_file_opener(
-        self, plugin_name: str, extension: str, callback: Callable, priority: int = 0
+        self,
+        plugin_name: str,
+        extension: str,
+        callback: Callable[..., Any],
+        priority: int = 0,
     ) -> None:
         """Register a file-type handler for the given extension."""
         # Normalize extension to lowercase
@@ -540,7 +549,7 @@ class PluginManager:
 
     # Analysis Tools registration
     def register_analysis_tool(
-        self, plugin_name: str, label: str, callback: Callable
+        self, plugin_name: str, label: str, callback: Callable[..., Any]
     ) -> None:
         """Register a plugin analysis tool with its label and callback."""
         self.analysis_tools.append(
@@ -548,16 +557,20 @@ class PluginManager:
         )
 
     # State Persistence registration
-    def register_save_handler(self, plugin_name: str, callback: Callable) -> None:
+    def register_save_handler(
+        self, plugin_name: str, callback: Callable[..., Any]
+    ) -> None:
         """Register a plugin session-save callback."""
         self.save_handlers[plugin_name] = callback
 
-    def register_load_handler(self, plugin_name: str, callback: Callable) -> None:
+    def register_load_handler(
+        self, plugin_name: str, callback: Callable[..., Any]
+    ) -> None:
         """Register a plugin session-load callback."""
         self.load_handlers[plugin_name] = callback
 
     def register_3d_style(
-        self, plugin_name: str, style_name: str, callback: Callable
+        self, plugin_name: str, style_name: str, callback: Callable[..., Any]
     ) -> None:
         """Register a named custom 3D rendering style."""
         self.custom_3d_styles[style_name] = {
@@ -566,14 +579,16 @@ class PluginManager:
         }
 
     def register_document_reset_handler(
-        self, plugin_name: str, callback: Callable
+        self, plugin_name: str, callback: Callable[..., Any]
     ) -> None:
         """Register callback to be invoked when a new document is created."""
         self.document_reset_handlers.append(
             {"plugin": plugin_name, "callback": callback}
         )
 
-    def register_atom_drag_handler(self, plugin_name: str, callback: Callable) -> None:
+    def register_atom_drag_handler(
+        self, plugin_name: str, callback: Callable[..., Any]
+    ) -> None:
         """Register a handler called during 3D atom/group dragging."""
         self.atom_drag_handlers.append({"plugin": plugin_name, "callback": callback})
 
@@ -676,7 +691,7 @@ class PluginManager:
         self,
         event_type: str,
         atom_indices: List[int],
-        positions: Dict[int, tuple],
+        positions: Dict[int, Tuple[float, ...]],
     ) -> None:
         """Call all registered atom drag handlers."""
         for handler in self.atom_drag_handlers:

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/ui/analysis_window.py

@@ -75,7 +75,7 @@ class AnalysisWindow(QDialog):
                 total_atoms = len(xyz_atoms)
                 num_heavy_atoms = 0
 
-                for symbol, x, y, z in xyz_atoms:
+                for symbol, _x, _y, _z in xyz_atoms:
                     atom_counts[symbol] = atom_counts.get(symbol, 0) + 1
                     if symbol != "H":  # Non-hydrogen
                         num_heavy_atoms += 1
@@ -154,12 +154,15 @@ class AnalysisWindow(QDialog):
 
                 # Calculate various properties
                 mol_formula = rdMolDescriptors.CalcMolFormula(self.mol)
-                mol_wt = Descriptors.MolWt(self.mol)
-                exact_mw = Descriptors.ExactMolWt(self.mol)
+                # Descriptors.MolWt is generated at import time from rdkit's
+                # descriptor table, so no stub can declare it; the rest have
+                # direct rdMolDescriptors equivalents used elsewhere here.
+                mol_wt = Descriptors.MolWt(self.mol)  # type: ignore[attr-defined]
+                exact_mw = rdMolDescriptors.CalcExactMolWt(self.mol)
                 num_heavy_atoms = self.mol.GetNumHeavyAtoms()
                 num_rings = rdMolDescriptors.CalcNumRings(self.mol)
-                log_p = Descriptors.MolLogP(self.mol)
-                tpsa = Descriptors.TPSA(self.mol)
+                log_p = rdMolDescriptors.CalcCrippenDescriptors(self.mol)[0]
+                tpsa = rdMolDescriptors.CalcTPSA(self.mol)
                 num_h_donors = rdMolDescriptors.CalcNumHBD(self.mol)
                 num_h_acceptors = rdMolDescriptors.CalcNumHBA(self.mol)
 

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/ui/app_state.py

@@ -19,7 +19,7 @@ import copy
 import logging
 import os
 from ..utils.suppress_log import suppress_log
-from typing import Any, Dict, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 
 import numpy as np
@@ -43,7 +43,7 @@ if TYPE_CHECKING:
 
 
 # --- Class Definition ---
-def _serialize_constraints(constraints: list) -> list:
+def _serialize_constraints(constraints: List[Any]) -> List[List[Any]]:
     """Convert internal constraint tuples to JSON-serializable lists."""
     result = []
     for const in constraints:
@@ -54,7 +54,7 @@ def _serialize_constraints(constraints: list) -> list:
     return result
 
 
-def _deserialize_constraints(raw: list) -> list:
+def _deserialize_constraints(raw: List[Any]) -> List[Tuple[Any, ...]]:
     """Convert JSON-loaded constraint lists back to internal tuples."""
     result = []
     for const in raw:
@@ -228,7 +228,7 @@ class StateManager:
                     if self.host.view_3d_manager.plotter and not getattr(
                         self.host, "is_restoring_state", False
                     ):
-                        self.host.view_3d_manager.plotter.reset_camera()
+                        self.host.view_3d_manager.plotter.reset_camera()  # type: ignore[call-arg]
 
                     self.host.ui_manager.enable_3d_features(True)
                     self.host.view_3d_manager.setup_3d_hover()
@@ -481,7 +481,9 @@ class StateManager:
                     json_data["molecular_info"] = {
                         "num_atoms": self.host.view_3d_manager.current_mol.GetNumAtoms(),
                         "num_bonds": self.host.view_3d_manager.current_mol.GetNumBonds(),
-                        "molecular_weight": Descriptors.MolWt(
+                        # Generated at import time from rdkit's descriptor
+                        # table, so no stub can declare it.
+                        "molecular_weight": Descriptors.MolWt(  # type: ignore[attr-defined]
                             self.host.view_3d_manager.current_mol
                         ),
                         "formula": rdMolDescriptors.CalcMolFormula(
@@ -620,7 +622,11 @@ class StateManager:
                 mol_base64 = structure_3d.get("mol_binary_base64")
                 if mol_base64:
                     mol_binary = base64.b64decode(mol_base64.encode("ascii"))
-                    self.host.set_current_molecule(Chem.Mol(mol_binary))
+                    # Chem.Mol accepts a pickled binary block at runtime;
+                    # the stub only overloads Mol/str.
+                    self.host.set_current_molecule(
+                        Chem.Mol(mol_binary)  # type: ignore[call-overload]
+                    )
                     if self.host.view_3d_manager.current_mol:
                         # Set 3D coordinates
                         if self.host.view_3d_manager.current_mol.GetNumConformers() > 0:
@@ -686,7 +692,7 @@ class StateManager:
                             self.host.set_is_2d_editable(True)
 
                         if self.host.view_3d_manager.plotter:
-                            self.host.view_3d_manager.plotter.reset_camera()
+                            self.host.view_3d_manager.plotter.reset_camera()  # type: ignore[call-arg]
 
                         # Enable 3D-related UI
                         try:

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/ui/atom_item.py

@@ -95,18 +95,18 @@ class AtomItem(QGraphicsItem):
             | QGraphicsItem.GraphicsItemFlag.ItemSendsGeometryChanges
         )
         self.setZValue(1)
+        self.font: QFont = QFont(FONT_FAMILY, 22, FONT_WEIGHT_BOLD)
         self.update_style()
         self.setAcceptHoverEvents(True)
         self.hovered: bool = False
         self.has_problem: bool = False
         self.is_visible: bool = True
-        self.font: QFont = QFont(FONT_FAMILY, 20, FONT_WEIGHT_BOLD)
 
     def update_style(self) -> None:
         """Refresh font, color, and visibility based on current scene settings."""
         if sip_isdeleted_safe(self):
             return
-        font_size = 20
+        font_size = 22
         font_family = FONT_FAMILY
         font_bold = True
         font_italic = False
@@ -114,7 +114,7 @@ class AtomItem(QGraphicsItem):
 
         scene: Any = self.scene()
         if scene is not None:
-            font_size = scene.get_setting("atom_font_size_2d", 20)
+            font_size = scene.get_setting("atom_font_size_2d", 22)
             font_family = scene.get_setting("atom_font_family_2d", FONT_FAMILY)
             font_bold = scene.get_setting("atom_font_bold_2d", True)
             font_italic = scene.get_setting("atom_font_italic_2d", False)
@@ -136,14 +136,14 @@ class AtomItem(QGraphicsItem):
 
     def visual_rect(self) -> QRectF:
         """Return the rectangle the atom draws into; highlights use this."""
-        font_size = 20
+        font_size = 22
         font_family = FONT_FAMILY
         font_bold = True
         font_italic = False
         font_underline = False
         scene: Any = self.scene()
         if scene is not None:
-            font_size = scene.get_setting("atom_font_size_2d", 20)
+            font_size = scene.get_setting("atom_font_size_2d", 22)
             font_family = scene.get_setting("atom_font_family_2d", FONT_FAMILY)
             font_bold = scene.get_setting("atom_font_bold_2d", True)
             font_italic = scene.get_setting("atom_font_italic_2d", False)
@@ -265,14 +265,14 @@ class AtomItem(QGraphicsItem):
         if not self.is_visible:
             return path
 
-        font_size = 20
+        font_size = 22
         font_family = FONT_FAMILY
         font_bold = True
         font_italic = False
         font_underline = False
         scene: Any = self.scene()
         if scene is not None:
-            font_size = scene.get_setting("atom_font_size_2d", 20)
+            font_size = scene.get_setting("atom_font_size_2d", 22)
             font_family = scene.get_setting("atom_font_family_2d", FONT_FAMILY)
             font_bold = scene.get_setting("atom_font_bold_2d", True)
             font_italic = scene.get_setting("atom_font_italic_2d", False)

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/ui/base_picking_dialog.py

@@ -11,7 +11,7 @@ DOI: 10.5281/zenodo.17268532
 """
 
 import logging
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import Any, List, Optional, Union, TYPE_CHECKING
 
 import numpy as np
 from PyQt6.QtCore import Qt, QTimer
@@ -25,7 +25,7 @@ if TYPE_CHECKING:
     from .main_window import MainWindow
 
 
-class SelectionList(list):
+class SelectionList(List[int]):
     """Order-preserving list that compares equal to sets/lists/tuples of same elements."""
 
     def __eq__(self, other: object) -> bool:

{moleditpy_linux-4.8.2 → moleditpy_linux-4.9.0}/src/moleditpy_linux/ui/bond_item.py

@@ -254,7 +254,7 @@ class BondItem(QGraphicsItem):
                 else "bond_spacing_double_2d"
             )
             bond_offset = scene.get_setting(key, 3.5)
-            wedge_width = scene.get_setting("bond_wedge_width_2d", 6.0)
+            wedge_width = scene.get_setting("bond_wedge_width_2d", 8.0)
 
         # Qt prunes clicks whose shape() escapes boundingRect().
         extra = (getattr(self, "order", 1) - 1) * bond_offset + 50 + wedge_width
@@ -270,7 +270,7 @@ class BondItem(QGraphicsItem):
             font_size = 20
             font_family = FONT_FAMILY
             if scene is not None:
-                font_size = scene.get_setting("atom_font_size_2d", 20)
+                font_size = scene.get_setting("atom_font_size_2d", 22)
                 font_family = scene.get_setting("atom_font_family_2d", FONT_FAMILY)
 
             font = QFont(font_family, font_size, FONT_WEIGHT_BOLD)
@@ -363,11 +363,11 @@ class BondItem(QGraphicsItem):
                     bond_color = QColor(color_hex)
 
                 # Width and Cap Style
-                bond_width = scene.get_setting("bond_width_2d", 2.0)
+                bond_width = scene.get_setting("bond_width_2d", 3.0)
                 cap_style_str = scene.get_setting("bond_cap_style_2d", "Round")
 
                 # Wedge/Dash settings
-                wedge_width_half = scene.get_setting("bond_wedge_width_2d", 6.0)
+                wedge_width_half = scene.get_setting("bond_wedge_width_2d", 8.0)
                 num_dashes = int(scene.get_setting("bond_dash_count_2d", 8))
 
                 # Cap Style logic
@@ -531,7 +531,7 @@ class BondItem(QGraphicsItem):
                         font_family = FONT_FAMILY
                         _sc: Any = self.scene()
                         if _sc is not None:
-                            font_size = _sc.get_setting("atom_font_size_2d", 20)
+                            font_size = _sc.get_setting("atom_font_size_2d", 22)
                             font_family = _sc.get_setting(
                                 "atom_font_family_2d", FONT_FAMILY
                             )