MoleditPy-linux 1.18.1__tar.gz → 2.0.0__tar.gz

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy-linux
-Version: 1.18.1
+Version: 2.0.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
@@ -760,6 +760,7 @@ This application combines a modern GUI built with **PyQt6**, powerful cheminform
       * Import structures from **MOL/SDF** files or **SMILES** strings.
       * Export 3D structures to **MOL** or **XYZ** formats, which are compatible with most DFT calculation software.
       * Export 2D and 3D views as high-resolution PNG images.
+  * **Plugin System:** Extend functionality with Python scripts. Place custom scripts in `~/.moleditpy/plugins` to add new features to the "Plugin" menu.
 
 ## Installation and Execution
 
@@ -874,6 +875,7 @@ This project is licensed under the **GNU General Public License v3.0 (GPL-v3)**.
       * **MOL/SDF**ファイルや**SMILES**文字列から構造をインポートできます。
       * 3D構造を**MOL**または**XYZ**形式でエクスポートでき、これらは多くのDFT計算ソフトウェアと互換性があります。
       * 2Dおよび3Dビューを高解像度のPNG画像としてエクスポートできます。
+  * **プラグインシステム:** Pythonスクリプトで機能を拡張できます。`~/.moleditpy/plugins` にスクリプトを配置することで、「Plugin」メニューに独自の機能を追加できます。
 
 ## インストールと実行
 

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/README.md

@@ -59,6 +59,7 @@ This application combines a modern GUI built with **PyQt6**, powerful cheminform
       * Import structures from **MOL/SDF** files or **SMILES** strings.
       * Export 3D structures to **MOL** or **XYZ** formats, which are compatible with most DFT calculation software.
       * Export 2D and 3D views as high-resolution PNG images.
+  * **Plugin System:** Extend functionality with Python scripts. Place custom scripts in `~/.moleditpy/plugins` to add new features to the "Plugin" menu.
 
 ## Installation and Execution
 
@@ -173,6 +174,7 @@ This project is licensed under the **GNU General Public License v3.0 (GPL-v3)**.
       * **MOL/SDF**ファイルや**SMILES**文字列から構造をインポートできます。
       * 3D構造を**MOL**または**XYZ**形式でエクスポートでき、これらは多くのDFT計算ソフトウェアと互換性があります。
       * 2Dおよび3Dビューを高解像度のPNG画像としてエクスポートできます。
+  * **プラグインシステム:** Pythonスクリプトで機能を拡張できます。`~/.moleditpy/plugins` にスクリプトを配置することで、「Plugin」メニューに独自の機能を追加できます。
 
 ## インストールと実行
 

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/pyproject.toml

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

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/src/MoleditPy_linux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy-linux
-Version: 1.18.1
+Version: 2.0.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
@@ -760,6 +760,7 @@ This application combines a modern GUI built with **PyQt6**, powerful cheminform
       * Import structures from **MOL/SDF** files or **SMILES** strings.
       * Export 3D structures to **MOL** or **XYZ** formats, which are compatible with most DFT calculation software.
       * Export 2D and 3D views as high-resolution PNG images.
+  * **Plugin System:** Extend functionality with Python scripts. Place custom scripts in `~/.moleditpy/plugins` to add new features to the "Plugin" menu.
 
 ## Installation and Execution
 
@@ -874,6 +875,7 @@ This project is licensed under the **GNU General Public License v3.0 (GPL-v3)**.
       * **MOL/SDF**ファイルや**SMILES**文字列から構造をインポートできます。
       * 3D構造を**MOL**または**XYZ**形式でエクスポートでき、これらは多くのDFT計算ソフトウェアと互換性があります。
       * 2Dおよび3Dビューを高解像度のPNG画像としてエクスポートできます。
+  * **プラグインシステム:** Pythonスクリプトで機能を拡張できます。`~/.moleditpy/plugins` にスクリプトを配置することで、「Plugin」メニューに独自の機能を追加できます。
 
 ## インストールと実行
 

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/src/MoleditPy_linux.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ src/moleditpy_linux/modules/molecule_scene.py
 src/moleditpy_linux/modules/move_group_dialog.py
 src/moleditpy_linux/modules/periodic_table_dialog.py
 src/moleditpy_linux/modules/planarize_dialog.py
+src/moleditpy_linux/modules/plugin_manager.py
 src/moleditpy_linux/modules/settings_dialog.py
 src/moleditpy_linux/modules/template_preview_item.py
 src/moleditpy_linux/modules/template_preview_view.py

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/src/moleditpy_linux/modules/constants.py

@@ -16,7 +16,7 @@ from PyQt6.QtGui import QFont, QColor
 from rdkit import Chem
 
 #Version
-VERSION = '1.18.1'
+VERSION = '2.0.0'
 
 ATOM_RADIUS = 18
 BOND_OFFSET = 3.5

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/src/moleditpy_linux/modules/main_window.py

@@ -211,6 +211,10 @@ class MainWindow(QMainWindow):
         # --- MOVED TO main_window_main_init.py ---
         return self.main_window_main_init.init_menu_bar()
 
+    def update_plugin_menu(self, plugin_menu):
+        # --- MOVED TO main_window_main_init.py ---
+        return self.main_window_main_init.update_plugin_menu(plugin_menu)
+
     def init_worker_thread(self):
         # --- MOVED TO main_window_main_init.py ---
         return self.main_window_main_init.init_worker_thread()

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/src/moleditpy_linux/modules/main_window_main_init.py

@@ -46,12 +46,16 @@ from PyQt6.QtCore import (
     Qt, QPointF, QRectF, QLineF, QUrl, QTimer
 )
 import platform
-import subprocess
 try:
     import winreg
 except Exception:
     winreg = None
 
+try:
+    from .plugin_manager import PluginManager
+except Exception:
+    from modules.plugin_manager import PluginManager
+
 
 def detect_system_dark_mode():
     """Return True if the OS prefers dark app theme, False if light, or None if unknown.
@@ -253,6 +257,14 @@ class MainWindowMainInit(object):
         # 3D編集ダイアログの参照を保持
         self.active_3d_dialogs = []
         
+
+        # プラグインマネージャーの初期化
+        try:
+            self.plugin_manager = PluginManager()
+        except Exception as e:
+            print(f"Failed to initialize PluginManager: {e}")
+            self.plugin_manager = None
+
         self.init_ui()
         self.init_worker_thread()
         self._setup_3d_picker() 
@@ -286,6 +298,7 @@ class MainWindowMainInit(object):
         self.update_atom_id_menu_text()
         self.update_atom_id_menu_state()
         
+        
         # 初期化完了を設定
         self.initialization_complete = True
         self.update_window_title()  # 初期化完了後にタイトルを更新
@@ -1188,6 +1201,25 @@ class MainWindowMainInit(object):
         edit_3d_menu.addAction(constrained_opt_action)
         self.constrained_opt_action = constrained_opt_action
 
+        # Plugin menu
+        plugin_menu = menu_bar.addMenu("&Plugin")
+        
+        open_plugin_dir_action = QAction("Open Plugin Directory", self)
+        if self.plugin_manager:
+            open_plugin_dir_action.triggered.connect(self.plugin_manager.open_plugin_folder)
+        else:
+            open_plugin_dir_action.setEnabled(False)
+        plugin_menu.addAction(open_plugin_dir_action)
+        
+        reload_plugins_action = QAction("Reload Plugins", self)
+        reload_plugins_action.triggered.connect(lambda: self.update_plugin_menu(plugin_menu))
+        plugin_menu.addAction(reload_plugins_action)
+        
+        plugin_menu.addSeparator()
+        
+        # Initial population of plugins
+        self.update_plugin_menu(plugin_menu)
+
         settings_menu = menu_bar.addMenu("&Settings")
         # 1) 3D View settings (existing)
         view_settings_action = QAction("3D View Settings...", self)
@@ -1675,3 +1707,35 @@ class MainWindowMainInit(object):
         except Exception as e:
             print(f"Error saving settings: {e}")
 
+    def update_plugin_menu(self, plugin_menu):
+        """Discovers plugins and updates the plugin menu actions."""
+        if not self.plugin_manager:
+            return
+
+        # Clear existing plugin actions
+        plugin_menu.clear()
+        
+        # Re-add static actions
+        open_plugin_dir_action = QAction("Open Plugin Directory", self)
+        open_plugin_dir_action.triggered.connect(self.plugin_manager.open_plugin_folder)
+        plugin_menu.addAction(open_plugin_dir_action)
+        
+        reload_plugins_action = QAction("Reload Plugins", self)
+        reload_plugins_action.triggered.connect(lambda: self.update_plugin_menu(plugin_menu))
+        plugin_menu.addAction(reload_plugins_action)
+        
+        plugin_menu.addSeparator()
+        
+        # Add dynamic plugin actions
+        plugins = self.plugin_manager.discover_plugins(self)
+        if not plugins:
+            no_plugin_action = QAction("(No plugins found)", self)
+            no_plugin_action.setEnabled(False)
+            plugin_menu.addAction(no_plugin_action)
+        else:
+            for p in plugins:
+                # Use default param in lambda to capture the current p
+                action = QAction(p['name'], self)
+                action.triggered.connect(lambda checked, mod=p['module']: self.plugin_manager.run_plugin(mod, self.mw if hasattr(self, 'mw') else self)) 
+                plugin_menu.addAction(action)
+

{moleditpy_linux-1.18.1 → moleditpy_linux-2.0.0}/src/moleditpy_linux/modules/molecule_scene.py

@@ -115,6 +115,15 @@ class MoleculeScene(QGraphicsScene):
         }
         self.reinitialize_items()
 
+    
+    def update_all_items(self):
+        """全てのアイテムを強制的に再描画する"""
+        for item in self.items():
+            if isinstance(item, (AtomItem, BondItem)):
+                item.update()
+        if self.views():
+            self.views()[0].viewport().update()
+
     def reinitialize_items(self):
         self.template_preview = TemplatePreviewItem(); self.addItem(self.template_preview)
         self.template_preview.hide(); self.template_preview_points = []; self.template_context = {}
@@ -185,6 +194,7 @@ class MoleculeScene(QGraphicsScene):
                 # Delete the entire rectangular selection
                 data_changed = self.delete_items(set(selected_items))
                 if data_changed:
+                    self.update_all_items()
                     self.window.push_undo_state()
                 self.press_pos = None
                 event.accept()
@@ -207,6 +217,7 @@ class MoleculeScene(QGraphicsScene):
                         logging.error(f"Error clearing E/Z label: {e}", exc_info=True)
                         if hasattr(self.window, 'statusBar'):
                             self.window.statusBar().showMessage(f"Error clearing E/Z label: {e}", 5000)
+                        self.update_all_items() # エラー時も整合性維持のため再描画
                 # AtomItemは何もしない
             # --- 通常の処理 ---
             elif isinstance(item, AtomItem):
@@ -233,6 +244,7 @@ class MoleculeScene(QGraphicsScene):
                     data_changed = self.delete_items({item})
 
             if data_changed:
+                self.update_all_items()
                 self.window.push_undo_state()
             self.press_pos = None
             event.accept()
@@ -342,7 +354,9 @@ class MoleculeScene(QGraphicsScene):
                 self.data_changed_in_event = True
                 # イベント処理をここで完了させ、下のアイテムが選択されるのを防ぐ
                 self.start_atom=None; self.start_pos = None; self.press_pos = None
-                if self.data_changed_in_event: self.window.push_undo_state()
+                if self.data_changed_in_event:
+                    self.update_all_items()
+                    self.window.push_undo_state()
                 return
 
         released_item = self.itemAt(end_pos, self.views()[0].transform())
@@ -384,11 +398,13 @@ class MoleculeScene(QGraphicsScene):
                         else:  # current_stereo == 4
                             new_stereo = 0  # E -> None
                         self.update_bond_stereo(b, new_stereo)
+                        self.update_all_items() # 強制再描画
                         self.window.push_undo_state()  # ここでUndo stackに積む
                 except Exception as e:
                     logging.error(f"Error in E/Z stereo toggle: {e}", exc_info=True)
                     if hasattr(self.window, 'statusBar'):
                         self.window.statusBar().showMessage(f"Error changing E/Z stereochemistry: {e}", 5000)
+                    self.update_all_items() # エラー時も整合性維持のため再描画
                 return # この後の処理は行わない
             elif self.bond_stereo != 0 and b.order == self.bond_order and b.stereo == self.bond_stereo:
                 # 方向性を反転させる
@@ -488,6 +504,10 @@ class MoleculeScene(QGraphicsScene):
             # 原子移動後に測定ラベルの位置を更新
             self.window.update_2d_measurement_labels()
             if self.views(): self.views()[0].viewport().update()
+        
+        if self.data_changed_in_event:
+            self.update_all_items()
+
         self.start_atom=None; self.start_pos = None; self.press_pos = None; self.temp_line = None
         self.template_context = {}
         # Clear user template data when switching modes
@@ -512,6 +532,7 @@ class MoleculeScene(QGraphicsScene):
                 self.data.atoms[item.atom_id]['charge'] = item.charge
                 item.update_style()
 
+            self.update_all_items()
             self.window.push_undo_state()
 
             event.accept()
@@ -635,6 +656,7 @@ class MoleculeScene(QGraphicsScene):
                 
         except Exception as e:
             logging.error(f"Error creating bond: {e}", exc_info=True)
+            self.update_all_items() # エラーリカバリー
 
     def add_molecule_fragment(self, points, bonds_info, existing_items=None, symbol='C'):
         """
@@ -1265,6 +1287,7 @@ class MoleculeScene(QGraphicsScene):
             print(f"Error during delete_items operation: {e}")
             
             traceback.print_exc()
+            self.update_all_items() # エラーリカバリー
             return False
     def purge_deleted_items(self):
         """Purge and release any held deleted-wrapper references.
@@ -1536,6 +1559,7 @@ class MoleculeScene(QGraphicsScene):
                     
                     # 計算した情報を使って、その場にフラグメントを追加
                     self.add_molecule_fragment(points, bonds_info, existing_items=existing_items)
+                    self.update_all_items()
                     self.window.push_undo_state()
 
             # --- 動作2: カーソルが空白領域にある場合 (モード切替) ---
@@ -1561,6 +1585,7 @@ class MoleculeScene(QGraphicsScene):
                     atom.radical = (atom.radical + 1) % 3
                     self.data.atoms[atom.atom_id]['radical'] = atom.radical
                     atom.update_style()
+                self.update_all_items()
                 self.window.push_undo_state()
                 event.accept()
                 return
@@ -1581,6 +1606,7 @@ class MoleculeScene(QGraphicsScene):
                     atom.charge += delta
                     self.data.atoms[atom.atom_id]['charge'] = atom.charge
                     atom.update_style()
+                self.update_all_items()
                 self.window.push_undo_state()
                 event.accept()
                 return
@@ -1610,6 +1636,7 @@ class MoleculeScene(QGraphicsScene):
                 for atom in atoms_to_update:
                     atom.update_style()
 
+                self.update_all_items()
                 self.window.push_undo_state()
                 event.accept()
                 return
@@ -1688,6 +1715,7 @@ class MoleculeScene(QGraphicsScene):
                     bond.update()
 
             if any_bond_changed:
+                self.update_all_items()
                 self.window.push_undo_state()
             
             if key in [Qt.Key.Key_1, Qt.Key.Key_2, Qt.Key.Key_3, Qt.Key.Key_W, Qt.Key.Key_D]:
@@ -1697,11 +1725,13 @@ class MoleculeScene(QGraphicsScene):
         if isinstance(self.hovered_item, BondItem) and self.hovered_item.order == 2:
             if event.key() == Qt.Key.Key_Z:
                 self.update_bond_stereo(self.hovered_item, 3)  # Z-isomer
+                self.update_all_items()
                 self.window.push_undo_state()
                 event.accept()
                 return
             elif event.key() == Qt.Key.Key_E:
                 self.update_bond_stereo(self.hovered_item, 4)  # E-isomer
+                self.update_all_items()
                 self.window.push_undo_state()
                 event.accept()
                 return
@@ -1809,6 +1839,7 @@ class MoleculeScene(QGraphicsScene):
                     self.create_bond(start_atom, new_atom_item, bond_order=target_order, bond_stereo=0)
 
                 self.clearSelection()
+                self.update_all_items()
                 self.window.push_undo_state()
                 event.accept()
                 return
@@ -1839,6 +1870,7 @@ class MoleculeScene(QGraphicsScene):
                 items_to_process.add(item_at_cursor)
 
             if self.delete_items(items_to_process):
+                self.update_all_items()
                 self.window.push_undo_state()
                 self.window.statusBar().showMessage("Deleted selected items.")
 
@@ -1973,3 +2005,4 @@ class MoleculeScene(QGraphicsScene):
             traceback.print_exc()
             if hasattr(self.window, 'statusBar'):
                 self.window.statusBar().showMessage(f"Error updating bond stereochemistry: {e}", 5000)
+            self.update_all_items() # エラーリカバリー

moleditpy_linux-2.0.0/src/moleditpy_linux/modules/plugin_manager.py

@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+plugin_manager.py
+Manages discovery, loading, and execution of external plugins.
+"""
+
+import os
+import sys
+import importlib.util
+import traceback
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtCore import QUrl
+from PyQt6.QtWidgets import QMessageBox
+
+class PluginManager:
+    def __init__(self):
+        self.plugin_dir = os.path.join(os.path.expanduser('~'), '.moleditpy', 'plugins')
+        self.plugins = [] # List of {"name": str, "module": module_obj}
+
+    def ensure_plugin_dir(self):
+        """Creates the plugin directory if it creates doesn't exist."""
+        if not os.path.exists(self.plugin_dir):
+            try:
+                os.makedirs(self.plugin_dir)
+            except OSError as e:
+                print(f"Error creating plugin directory: {e}")
+
+    def open_plugin_folder(self):
+        """Opens the plugin directory in the OS file explorer."""
+        self.ensure_plugin_dir()
+        QDesktopServices.openUrl(QUrl.fromLocalFile(self.plugin_dir))
+
+    def discover_plugins(self, parent=None):
+        """
+        Scans the plugin directory for .py files and attempts to import them.
+        Returns a list of valid loaded plugins.
+        """
+        self.ensure_plugin_dir()
+        self.plugins = []
+        
+        if not os.path.exists(self.plugin_dir):
+            return []
+
+        for filename in os.listdir(self.plugin_dir):
+            if filename.endswith(".py") and not filename.startswith("__"):
+                filepath = os.path.join(self.plugin_dir, filename)
+                try:
+                    # Dynamically import the module
+                    spec = importlib.util.spec_from_file_location(filename[:-3], filepath)
+                    if spec and spec.loader:
+                        module = importlib.util.module_from_spec(spec)
+                        sys.modules[spec.name] = module # helper for relative imports if needed
+                        spec.loader.exec_module(module)
+
+                        # Check for required attributes
+                        plugin_name = getattr(module, 'PLUGIN_NAME', filename[:-3])
+                        
+                        # Validate that it has a run function
+                        if hasattr(module, 'run') and callable(module.run):
+                            self.plugins.append({
+                                'name': plugin_name,
+                                'module': module
+                            })
+                        else:
+                            print(f"Plugin {filename} skipped: Missing 'run(main_window)' function.")
+                except Exception as e:
+                    # Robust error handling with user notification
+                    msg = f"Failed to load plugin {filename}:\n{e}"
+                    print(msg)
+                    traceback.print_exc()
+                    if parent:
+                        QMessageBox.warning(parent, "Plugin Load Error", msg)
+        
+        return self.plugins
+
+    def run_plugin(self, module, main_window):
+        """Executes the plugin's run method."""
+        try:
+            module.run(main_window)
+        except Exception as e:
+            QMessageBox.critical(main_window, "Plugin Error", f"Error running plugin '{getattr(module, 'PLUGIN_NAME', 'Unknown')}':\n{e}")
+            traceback.print_exc()
+