MoleditPy 2.4.0__tar.gz → 2.4.2__tar.gz

{moleditpy-2.4.0 → moleditpy-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy
-Version: 2.4.0
+Version: 2.4.2
 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

{moleditpy-2.4.0 → moleditpy-2.4.2}/pyproject.toml

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

{moleditpy-2.4.0 → moleditpy-2.4.2}/src/MoleditPy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy
-Version: 2.4.0
+Version: 2.4.2
 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

{moleditpy-2.4.0 → moleditpy-2.4.2}/src/moleditpy/modules/constants.py

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

{moleditpy-2.4.0 → moleditpy-2.4.2}/src/moleditpy/modules/main_window.py

@@ -500,6 +500,10 @@ class MainWindow(QMainWindow):
         # --- MOVED TO main_window_export.py ---
         return self.main_window_export.export_2d_png()
 
+    def export_2d_svg(self):
+        # --- MOVED TO main_window_export.py ---
+        return self.main_window_export.export_2d_svg()
+
     def export_3d_png(self):
         # --- MOVED TO main_window_export.py ---
         return self.main_window_export.export_3d_png()
@@ -528,6 +532,10 @@ class MainWindow(QMainWindow):
         # --- MOVED TO main_window_edit_actions.py ---
         return self.main_window_edit_actions.open_rotate_2d_dialog()
 
+    def rotate_molecule_2d(self, angle_degrees):
+        # --- MOVED TO main_window_edit_actions.py ---
+        return self.main_window_edit_actions.rotate_molecule_2d(angle_degrees)
+
     def draw_molecule_3d(self, mol):
         # --- MOVED TO main_window_view_3d.py ---
         return self.main_window_view_3d.draw_molecule_3d(mol)

{moleditpy-2.4.0 → moleditpy-2.4.2}/src/moleditpy/modules/main_window_edit_actions.py

@@ -618,18 +618,15 @@ class MainWindowEditActions(object):
             self.rotate_molecule_2d(angle)
 
     def rotate_molecule_2d(self, angle_degrees):
-        """2D分子を指定角度回転させる（選択範囲があればそれのみ、なければ全体）"""
+        """2D分子を指定角度回転させる（選択範囲があればそれのみ）"""
         try:
             # Determine target atoms
             selected_items = self.scene.selectedItems()
             target_atoms = [item for item in selected_items if isinstance(item, AtomItem)]
             
-            # If no selection, rotate everything
+            # If no selection, do not rotate
             if not target_atoms:
-                target_atoms = [data['item'] for data in self.data.atoms.values() if data.get('item') and not sip_isdeleted_safe(data['item'])]
-            
-            if not target_atoms:
-                self.statusBar().showMessage("No atoms to rotate.")
+                self.statusBar().showMessage("No atoms selected to rotate.")
                 return
 
             # Calculate Center
@@ -663,6 +660,8 @@ class MainWindowEditActions(object):
             self.push_undo_state()
             self.statusBar().showMessage(f"Rotated {len(target_atoms)} atoms by {angle_degrees} degrees.")
             self.scene.update()
+            # Force full redraw as requested
+            self.scene.update_all_items()
             
         except Exception as e:
             print(f"Error rotating molecule: {e}")

{moleditpy-2.4.0 → moleditpy-2.4.2}/src/moleditpy/modules/main_window_export.py

@@ -37,9 +37,11 @@ from PyQt6.QtGui import (
     QBrush, QColor, QPainter, QImage
 )
 
+from PyQt6.QtSvg import QSvgGenerator
+
 
 from PyQt6.QtCore import (
-    Qt, QRectF
+    Qt, QRectF, QSize
 )
 
 import pyvista as pv
@@ -753,6 +755,118 @@ class MainWindowExport(object):
 
 
 
+    def export_2d_svg(self):
+        """2D drawingをSVGとしてエクスポート"""
+        if not self.data.atoms:
+            self.statusBar().showMessage("Nothing to export.")
+            return
+
+        # default filename
+        default_name = "untitled-2d"
+        try:
+            if self.current_file_path:
+                base = os.path.basename(self.current_file_path)
+                name = os.path.splitext(base)[0]
+                default_name = f"{name}-2d"
+        except Exception:
+            default_name = "untitled-2d"
+
+        # prefer same directory
+        default_path = default_name
+        try:
+            if self.current_file_path:
+                default_path = os.path.join(os.path.dirname(self.current_file_path), default_name)
+        except Exception:
+            default_path = default_name
+
+        filePath, _ = QFileDialog.getSaveFileName(self, "Export 2D as SVG", default_path, "SVG Files (*.svg)")
+        if not filePath:
+            return
+
+        if not (filePath.lower().endswith(".svg")):
+            filePath += ".svg"
+
+        # Ask about transparency
+        reply = QMessageBox.question(self, 'Choose Background',
+                                     'Do you want a transparent background?\n(Choose "No" to use the current background color)',
+                                     QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No | QMessageBox.StandardButton.Cancel,
+                                     QMessageBox.StandardButton.Yes)
+
+        if reply == QMessageBox.StandardButton.Cancel:
+            self.statusBar().showMessage("Export cancelled.", 2000)
+            return
+
+        is_transparent = (reply == QMessageBox.StandardButton.Yes)
+
+        try:
+            # 1. Hide non-molecular items if needed (optional, keeping consistent with PNG export)
+            items_to_restore = {}
+            original_background = self.scene.backgroundBrush()
+            
+            all_items = list(self.scene.items())
+            for item in all_items:
+                is_mol_part = isinstance(item, (AtomItem, BondItem))
+                if not (is_mol_part and item.isVisible()):
+                    # Keep measurement items visible if they are part of the scene? 
+                    # For now, let's stick to hiding everything that isn't atom/bond,
+                    # similar to png export logic, or we can decide to export everything visible.
+                    # The PNG export hides non-atom/bond items. Let's follow that for consistency.
+                    items_to_restore[item] = item.isVisible()
+                    item.hide()
+
+            # 2. Calculate bounds
+            molecule_bounds = QRectF()
+            for item in self.scene.items():
+                if isinstance(item, (AtomItem, BondItem)) and item.isVisible():
+                    molecule_bounds = molecule_bounds.united(item.sceneBoundingRect())
+
+            if molecule_bounds.isEmpty() or not molecule_bounds.isValid():
+                self.statusBar().showMessage("Error: Could not determine molecule bounds for export.")
+                # Restore
+                for item, was_visible in items_to_restore.items():
+                    item.setVisible(was_visible)
+                return
+
+            if is_transparent:
+                self.scene.setBackgroundBrush(QBrush(Qt.BrushStyle.NoBrush))
+            
+            # Margin
+            rect_to_render = molecule_bounds.adjusted(-20, -20, 20, 20)
+            
+            width = int(rect_to_render.width())
+            height = int(rect_to_render.height())
+
+            # 3. Setup QSvgGenerator
+            generator = QSvgGenerator()
+            generator.setFileName(filePath)
+            generator.setSize(QSize(width, height))
+            generator.setViewBox(rect_to_render)
+            generator.setTitle("MoleditPy Molecule")
+            
+            # 4. Render
+            painter = QPainter()
+            painter.begin(generator)
+            try:
+                self.scene.render(painter, rect_to_render, rect_to_render)
+            finally:
+                painter.end()
+
+            self.statusBar().showMessage(f"2D view exported to {filePath}")
+
+        except Exception as e:
+            self.statusBar().showMessage(f"An unexpected error occurred during SVG export: {e}")
+
+        finally:
+            # Restore
+            for item, was_visible in items_to_restore.items():
+                item.setVisible(was_visible)
+            if 'original_background' in locals():
+                self.scene.setBackgroundBrush(original_background)
+            if self.view_2d:
+                self.view_2d.viewport().update()
+
+
+
     def export_3d_png(self):
         if not self.current_mol:
             self.statusBar().showMessage("No 3D molecule to export.", 2000)

{moleditpy-2.4.0 → moleditpy-2.4.2}/src/moleditpy/modules/main_window_main_init.py

@@ -920,6 +920,10 @@ class MainWindowMainInit(object):
         export_2d_png_action = QAction("PNG Image...", self)
         export_2d_png_action.triggered.connect(self.export_2d_png)
         export_2d_menu.addAction(export_2d_png_action)
+
+        export_2d_svg_action = QAction("SVG Image...", self)
+        export_2d_svg_action.triggered.connect(self.export_2d_svg)
+        export_2d_menu.addAction(export_2d_svg_action)
         
         # 3D エクスポート
         export_3d_menu = export_menu.addMenu("3D Formats")
@@ -1597,6 +1601,15 @@ class MainWindowMainInit(object):
                 except Exception:
                     pass
                 # Update 2D scene styling to reflect default CPK colors
+                try:
+                    # Reset 2D background specifically
+                    if hasattr(self, 'scene') and self.scene:
+                        bg_c = self.settings.get('background_color_2d', '#FFFFFF')
+                        self.scene.setBackgroundBrush(QBrush(QColor(bg_c)))
+                    
+                    self.update_cpk_colors_from_settings()
+                except Exception:
+                    pass
                 try:
                     if hasattr(self, 'scene') and self.scene:
                         for it in list(self.scene.items()):

{moleditpy-2.4.0 → moleditpy-2.4.2}/src/moleditpy/modules/molecule_scene.py

@@ -116,6 +116,20 @@ class MoleculeScene(QGraphicsScene):
         self.reinitialize_items()
 
     
+    def update_connected_bonds(self, atoms):
+        """指定された原子リストに接続する全ての結合の位置を更新する"""
+        bonds_to_update = set()
+        for atom in atoms:
+            if hasattr(atom, 'bonds'):
+                bonds_to_update.update(atom.bonds)
+        
+        for bond in bonds_to_update:
+            try:
+                if not sip_isdeleted_safe(bond):
+                    bond.update_position()
+            except Exception:
+                continue
+
     def update_all_items(self):
         """全てのアイテムを強制的に再描画する"""
         for item in self.items():