VeraGrid 5.6.18__tar.gz → 5.6.20__tar.gz

{veragrid-5.6.18 → veragrid-5.6.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.6.18
+Version: 5.6.20
 Summary: VeraGrid is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/VeraGrid
 Author: Santiago Peñate Vera et. Al.

veragrid-5.6.20/VeraGrid/Gui/CGMESDialogue/cgmes_export.py

@@ -0,0 +1,136 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+import os
+from PySide6 import QtWidgets
+from VeraGrid.Gui.CGMESDialogue.cgmes_export_gui import Ui_CgmesExportDialog
+import VeraGrid.Session.file_handler as filedrv
+import VeraGrid.Gui.gui_functions as gf
+from VeraGridEngine.enumerations import CGMESVersions
+from VeraGridEngine.IO.cim.cgmes.cgmes_export import get_available_cgmes_profiles
+from VeraGridEngine.IO.cim.cgmes.cgmes_enums import CgmesProfileType
+
+if TYPE_CHECKING:
+    from VeraGrid.Gui.Main.SubClasses.io import IoMain
+
+
+class CgmesExportDialogue(QtWidgets.QDialog):
+    """
+    GridMergeDialogue
+    """
+
+    def __init__(self, app: IoMain):
+        """
+        GridMergeDialogue
+        :param app: VeraGridMainGUI
+        """
+        QtWidgets.QDialog.__init__(self)
+        self.ui = Ui_CgmesExportDialog()
+        self.ui.setupUi(self)
+        self.setWindowTitle('CGMES export')
+        self.setModal(True)
+
+        self.grid = app.circuit
+
+        self.sessions_data = app.session
+
+        self.project_directory = app.project_directory
+
+        self.app: IoMain = app
+
+        self.current_boundary_set = ""
+
+        self.cgmes_version_dict = {x.value: x for x in [CGMESVersions.v2_4_15,
+                                                        CGMESVersions.v3_0_0]}
+        self.ui.cgmes_version_comboBox.setModel(gf.get_list_model(list(self.cgmes_version_dict.keys())))
+
+        self.cgmes_profiles_dict = {key: CgmesProfileType(key) for key, val in
+                                    get_available_cgmes_profiles(cgmes_version=CGMESVersions.v2_4_15).items()}
+
+        self.ui.cgmes_profiles_listView.setModel(gf.get_list_model(list(self.cgmes_profiles_dict.keys()),
+                                                                   checks=True, check_value=True))
+
+        # Buttons
+        self.ui.selectCGMESBoundarySetButton.clicked.connect(self.select_cgmes_boundary_set)
+        self.ui.exportButton.clicked.connect(self.export)
+
+        # change
+        self.ui.cgmes_version_comboBox.currentTextChanged.connect(self.cgmes_version_change)
+
+    def cgmes_version_change(self):
+        """
+        On GUI cgmes version change, display only the supported profiles
+        """
+        cgmes_version = self.cgmes_version_dict[self.ui.cgmes_version_comboBox.currentText()]
+
+        self.cgmes_profiles_dict = {key: CgmesProfileType(key) for key, val in
+                                    get_available_cgmes_profiles(cgmes_version=cgmes_version).items()}
+
+        self.ui.cgmes_profiles_listView.setModel(gf.get_list_model(list(self.cgmes_profiles_dict.keys()),
+                                                                   checks=True, check_value=True))
+
+    def select_cgmes_boundary_set(self):
+        """
+        Select the current boundary set
+        """
+        files_types = "Boundary set (*.zip)"
+
+        dialogue = QtWidgets.QFileDialog(None,
+                                         caption='Select Boundary set file',
+                                         directory=self.project_directory,
+                                         filter=files_types)
+        if dialogue.exec():
+            filenames = dialogue.selectedFiles()
+            if len(filenames) > 0:
+                self.current_boundary_set = filenames[0]
+                self.ui.cgmes_boundary_set_label.setText(self.current_boundary_set)
+
+    def export(self) -> None:
+        """
+        The elements of the grid will be added with new idtags.
+        This is useful in the case you want to compose a new grid from grids that are the same.
+        :return:
+        """
+        cgmes_version = self.cgmes_version_dict[self.ui.cgmes_version_comboBox.currentText()]
+        cgmes_profiles_txt = gf.get_checked_values(mdl=self.ui.cgmes_profiles_listView.model())
+        cgmes_profiles = [self.cgmes_profiles_dict[e] for e in cgmes_profiles_txt]
+        cgmes_one_file_per_profile = self.ui.cgmes_single_profile_per_file_checkBox.isChecked()
+        cgmes_map_areas_like_raw = self.ui.cgmes_map_regions_like_raw_checkBox.isChecked()
+
+        options = filedrv.FileSavingOptions(cgmes_boundary_set=self.current_boundary_set,
+                                            sessions_data=self.sessions_data.get_save_data(),
+                                            dictionary_of_json_files=dict(),
+                                            cgmes_version=cgmes_version,
+                                            cgmes_profiles=cgmes_profiles,
+                                            cgmes_one_file_per_profile=cgmes_one_file_per_profile,
+                                            cgmes_map_areas_like_raw=cgmes_map_areas_like_raw)
+
+        # if the global file_name is empty, ask where to save
+        fname = os.path.join(self.project_directory, self.app.ui.grid_name_line_edit.text())
+
+        files_types = "CGMES (*.zip);;"
+        filename, type_selected = QtWidgets.QFileDialog.getSaveFileName(self,
+                                                                        'Export to CGMES',
+                                                                        fname,
+                                                                        files_types)
+
+        if filename != '':
+
+            # if the user did not enter the extension, add it automatically
+            name, file_extension = os.path.splitext(filename)
+
+            if file_extension == '':
+                filename = name + '.zip'
+
+            # we were able to compose the file correctly, now save it
+            self.app.save_file_now(filename=filename,
+                                   type_selected=type_selected,
+                                   options=options)
+
+            self.app.show_info_toast("CGMES export done!")
+            self.close()
+

veragrid-5.6.20/VeraGrid/Gui/CGMESDialogue/cgmes_export_gui.py

@@ -0,0 +1,177 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'cgmes_export_gui.ui'
+##
+## Created by: Qt User Interface Compiler version 6.10.1
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
+
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QDialog,
+    QFrame, QGridLayout, QLabel, QListView,
+    QPushButton, QSizePolicy, QVBoxLayout, QWidget)
+from VeraGrid.Gui.Icons.icons_rc import *
+
+class Ui_CgmesExportDialog(object):
+    def setupUi(self, CgmesExportDialog):
+        if not CgmesExportDialog.objectName():
+            CgmesExportDialog.setObjectName(u"CgmesExportDialog")
+        CgmesExportDialog.resize(425, 569)
+        self.verticalLayout_2 = QVBoxLayout(CgmesExportDialog)
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
+        self.frame_79 = QFrame(CgmesExportDialog)
+        self.frame_79.setObjectName(u"frame_79")
+        self.frame_79.setMinimumSize(QSize(300, 0))
+        self.frame_79.setFrameShape(QFrame.Shape.NoFrame)
+        self.frame_79.setFrameShadow(QFrame.Shadow.Raised)
+        self.gridLayout_5 = QGridLayout(self.frame_79)
+        self.gridLayout_5.setObjectName(u"gridLayout_5")
+        self.label_139 = QLabel(self.frame_79)
+        self.label_139.setObjectName(u"label_139")
+
+        self.gridLayout_5.addWidget(self.label_139, 11, 0, 1, 3)
+
+        self.cgmes_version_comboBox = QComboBox(self.frame_79)
+        self.cgmes_version_comboBox.setObjectName(u"cgmes_version_comboBox")
+
+        self.gridLayout_5.addWidget(self.cgmes_version_comboBox, 3, 0, 1, 3)
+
+        self.line_31 = QFrame(self.frame_79)
+        self.line_31.setObjectName(u"line_31")
+        palette = QPalette()
+        brush = QBrush(QColor(186, 189, 182, 255))
+        brush.setStyle(Qt.BrushStyle.SolidPattern)
+        palette.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.WindowText, brush)
+        palette.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.WindowText, brush)
+        brush1 = QBrush(QColor(190, 190, 190, 255))
+        brush1.setStyle(Qt.BrushStyle.SolidPattern)
+        palette.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.WindowText, brush1)
+        self.line_31.setPalette(palette)
+        self.line_31.setFrameShadow(QFrame.Shadow.Plain)
+        self.line_31.setLineWidth(4)
+        self.line_31.setFrameShape(QFrame.Shape.HLine)
+
+        self.gridLayout_5.addWidget(self.line_31, 1, 0, 1, 3)
+
+        self.selectCGMESBoundarySetButton = QPushButton(self.frame_79)
+        self.selectCGMESBoundarySetButton.setObjectName(u"selectCGMESBoundarySetButton")
+        self.selectCGMESBoundarySetButton.setMaximumSize(QSize(80, 16777215))
+
+        self.gridLayout_5.addWidget(self.selectCGMESBoundarySetButton, 9, 2, 1, 1)
+
+        self.cgmes_map_regions_like_raw_checkBox = QCheckBox(self.frame_79)
+        self.cgmes_map_regions_like_raw_checkBox.setObjectName(u"cgmes_map_regions_like_raw_checkBox")
+
+        self.gridLayout_5.addWidget(self.cgmes_map_regions_like_raw_checkBox, 14, 0, 1, 3)
+
+        self.cgmes_single_profile_per_file_checkBox = QCheckBox(self.frame_79)
+        self.cgmes_single_profile_per_file_checkBox.setObjectName(u"cgmes_single_profile_per_file_checkBox")
+
+        self.gridLayout_5.addWidget(self.cgmes_single_profile_per_file_checkBox, 13, 0, 1, 3)
+
+        self.label_135 = QLabel(self.frame_79)
+        self.label_135.setObjectName(u"label_135")
+
+        self.gridLayout_5.addWidget(self.label_135, 2, 0, 1, 3)
+
+        self.label_102 = QLabel(self.frame_79)
+        self.label_102.setObjectName(u"label_102")
+
+        self.gridLayout_5.addWidget(self.label_102, 10, 0, 1, 1)
+
+        self.label_134 = QLabel(self.frame_79)
+        self.label_134.setObjectName(u"label_134")
+        palette1 = QPalette()
+        brush2 = QBrush(QColor(85, 87, 83, 255))
+        brush2.setStyle(Qt.BrushStyle.SolidPattern)
+        palette1.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.WindowText, brush2)
+        brush3 = QBrush(QColor(0, 0, 0, 255))
+        brush3.setStyle(Qt.BrushStyle.SolidPattern)
+        palette1.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.WindowText, brush3)
+        palette1.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.WindowText, brush1)
+        self.label_134.setPalette(palette1)
+        font = QFont()
+        font.setPointSize(16)
+        self.label_134.setFont(font)
+
+        self.gridLayout_5.addWidget(self.label_134, 0, 1, 1, 2)
+
+        self.label_90 = QLabel(self.frame_79)
+        self.label_90.setObjectName(u"label_90")
+
+        self.gridLayout_5.addWidget(self.label_90, 8, 0, 1, 3)
+
+        self.cgmes_dc_as_hvdclines_checkBox = QCheckBox(self.frame_79)
+        self.cgmes_dc_as_hvdclines_checkBox.setObjectName(u"cgmes_dc_as_hvdclines_checkBox")
+
+        self.gridLayout_5.addWidget(self.cgmes_dc_as_hvdclines_checkBox, 15, 0, 1, 3)
+
+        self.label_137 = QLabel(self.frame_79)
+        self.label_137.setObjectName(u"label_137")
+        self.label_137.setMinimumSize(QSize(24, 24))
+        self.label_137.setMaximumSize(QSize(24, 24))
+        self.label_137.setPixmap(QPixmap(u":/Icons/icons/new2.png"))
+        self.label_137.setScaledContents(True)
+
+        self.gridLayout_5.addWidget(self.label_137, 0, 0, 1, 1)
+
+        self.cgmes_profiles_listView = QListView(self.frame_79)
+        self.cgmes_profiles_listView.setObjectName(u"cgmes_profiles_listView")
+
+        self.gridLayout_5.addWidget(self.cgmes_profiles_listView, 12, 0, 1, 3)
+
+        self.cgmes_boundary_set_label = QLabel(self.frame_79)
+        self.cgmes_boundary_set_label.setObjectName(u"cgmes_boundary_set_label")
+
+        self.gridLayout_5.addWidget(self.cgmes_boundary_set_label, 9, 0, 1, 2)
+
+        self.exportButton = QPushButton(self.frame_79)
+        self.exportButton.setObjectName(u"exportButton")
+
+        self.gridLayout_5.addWidget(self.exportButton, 16, 2, 1, 1)
+
+
+        self.verticalLayout_2.addWidget(self.frame_79)
+
+
+        self.retranslateUi(CgmesExportDialog)
+
+        QMetaObject.connectSlotsByName(CgmesExportDialog)
+    # setupUi
+
+    def retranslateUi(self, CgmesExportDialog):
+        CgmesExportDialog.setWindowTitle(QCoreApplication.translate("CgmesExportDialog", u"CGMES Export", None))
+        self.label_139.setText(QCoreApplication.translate("CgmesExportDialog", u"Profiles to export", None))
+#if QT_CONFIG(tooltip)
+        self.selectCGMESBoundarySetButton.setToolTip(QCoreApplication.translate("CgmesExportDialog", u"Select the CGMES boundary set (single zip file)", None))
+#endif // QT_CONFIG(tooltip)
+        self.selectCGMESBoundarySetButton.setText(QCoreApplication.translate("CgmesExportDialog", u"Select", None))
+#if QT_CONFIG(tooltip)
+        self.cgmes_map_regions_like_raw_checkBox.setToolTip(QCoreApplication.translate("CgmesExportDialog", u"<html><head/><body><p>If active the CGMEs mapping will be:</p><p>GeographicalRegion &lt;-&gt; Area</p><p>SubGeographicalRegion &lt;-&gt; Zone</p><p>Otherwise:</p><p>GeographicalRegion &lt;-&gt; Country</p><p>SubGeographicalRegion &lt;-&gt; Community</p><p><br/></p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.cgmes_map_regions_like_raw_checkBox.setText(QCoreApplication.translate("CgmesExportDialog", u"Map regions like raw files", None))
+        self.cgmes_single_profile_per_file_checkBox.setText(QCoreApplication.translate("CgmesExportDialog", u"One file per profile", None))
+        self.label_135.setText(QCoreApplication.translate("CgmesExportDialog", u"Export version", None))
+        self.label_102.setText("")
+        self.label_134.setText(QCoreApplication.translate("CgmesExportDialog", u"CGMES", None))
+        self.label_90.setText(QCoreApplication.translate("CgmesExportDialog", u"Boundary set", None))
+#if QT_CONFIG(tooltip)
+        self.cgmes_dc_as_hvdclines_checkBox.setToolTip(QCoreApplication.translate("CgmesExportDialog", u"<html><head/><body><p>Converters and DC lines in CGMES are attempted to be converted to the simplified HvdcLine objects in VeraGrid</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.cgmes_dc_as_hvdclines_checkBox.setText(QCoreApplication.translate("CgmesExportDialog", u"Treat DC equipement as HvdcLines", None))
+        self.label_137.setText("")
+#if QT_CONFIG(tooltip)
+        self.cgmes_boundary_set_label.setToolTip(QCoreApplication.translate("CgmesExportDialog", u"Path of the CGMES default boundary set (single zip file)", None))
+#endif // QT_CONFIG(tooltip)
+        self.cgmes_boundary_set_label.setText(QCoreApplication.translate("CgmesExportDialog", u"...", None))
+        self.exportButton.setText(QCoreApplication.translate("CgmesExportDialog", u"Export", None))
+    # retranslateUi
+

veragrid-5.6.20/VeraGrid/Gui/CGMESDialogue/update_gui_file.py

@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+"""
+Script to update correctly the main GUI (.py) file from the Qt design (.ui) file
+"""
+from VeraGrid.Gui.update_gui_common import convert_ui_file
+
+if __name__ == '__main__':
+    for f in ['cgmes_export_gui.ui']:
+        convert_ui_file(source=f)

{veragrid-5.6.18 → veragrid-5.6.20}/VeraGrid/Gui/Diagrams/MapWidget/Injections/map_injections_template_graphics.py

@@ -136,7 +136,7 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
         Updates the element position in the diagram (to save)
         :return:
         """
-        lat, long = self.editor.to_lat_lon(self.rect().x(), self.rect().y())
+        lat, long = self.editor.to_lat_lon(self.get_xc(), self.get_yc())
 
         self.lat = lat
         self.lon = long
@@ -253,11 +253,17 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
         menu = self.get_base_context_menu()
         menu.exec(event.screenPos())
 
+    def get_xc(self) -> float:
+        return self.rect().x() + self.size/2
+
+    def get_yc(self) -> float:
+        return self.rect().y() + self.size/2
+
     def consolidate_coordinates(self):
         """
         Consolidate coordinates in to the DB
         """
-        lat, long = self.editor.to_lat_lon(self.rect().x(), self.rect().y())
+        lat, long = self.editor.to_lat_lon(self.get_xc(), self.get_yc())
         self.api_object.latitude = lat
         self.api_object.longitude = long
         self.editor.gui.show_info_toast("Coordinates consolidated!")

{veragrid-5.6.18 → veragrid-5.6.20}/VeraGrid/Gui/Diagrams/MapWidget/Substation/node_template.py

@@ -5,7 +5,6 @@
 from __future__ import annotations
 from typing import Union, TYPE_CHECKING, Dict, Callable, List
 from PySide6.QtCore import QPointF
-from PySide6.QtGui import QBrush
 
 from VeraGrid.Gui.Diagrams.MapWidget.Branches.map_line_segment import MapLineSegment
 from VeraGrid.Gui.Diagrams.generic_graphics import GenericDiagramWidget
@@ -41,14 +40,30 @@ class NodeTemplate(GenericDiagramWidget):
                                       editor=editor,
                                       draw_labels=draw_labels)
 
-        self.lat = lat
-        self.lon = lon
+        self._lat = lat
+        self._lon = lon
 
         self.hovered = False
         self.needsUpdate = False
 
         self._hosting_connections: Dict[MapLineSegment, Callable[[float, float], None]] = dict()
 
+    @property
+    def lat(self):
+        return self._lat
+
+    @lat.setter
+    def lat(self, val: float):
+        self._lat = val
+
+    @property
+    def lon(self):
+        return self._lon
+
+    @lon.setter
+    def lon(self, val: float):
+        self._lon = val
+
     def add_position_change_callback(self, obj: MapLineSegment, fcn: Callable[[float, float], None]):
         """
         Add callable function

{veragrid-5.6.18 → veragrid-5.6.20}/VeraGrid/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -9,13 +9,11 @@ from PySide6 import QtWidgets
 from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsRectItem
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor
-from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_static_generator_graphics import (MapStaticGeneratorGraphicItem,
-                                                                                      StaticGenerator)
-from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_external_grid_graphics import (MapExternalGridGraphicItem,
-                                                                                   ExternalGrid)
-from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_battery_graphics import MapBatteryGraphicItem, Battery
-from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_generator_graphics import MapGeneratorGraphicItem, Generator
-from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_load_graphics import MapLoadGraphicItem, Load
+from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_static_generator_graphics import (StaticGenerator)
+from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_external_grid_graphics import (ExternalGrid)
+from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_battery_graphics import Battery
+from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_generator_graphics import Generator
+from VeraGrid.Gui.Diagrams.MapWidget.Injections.map_load_graphics import Load
 from VeraGrid.Gui.Diagrams.MapWidget.Branches.map_line_container import MapLineContainer
 from VeraGrid.Gui.Diagrams.MapWidget.Substation.node_template import NodeTemplate
 from VeraGrid.Gui.Diagrams.generic_graphics import GenericDiagramWidget
@@ -278,12 +276,24 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         for i, vl_graphics in enumerate(sorted_objects):
             vl_graphics.setZValue(i)
 
+    def get_xc(self) -> float:
+        return self.rect().x() + self.size/2
+
+    def get_yc(self) -> float:
+        return self.rect().y() + self.size/2
+
     def update_position_at_the_diagram(self) -> None:
         """
         Updates the element position in the diagram (to save)
         :return: 
         """
-        lat, long = self.editor.to_lat_lon(self.rect().x(), self.rect().y())
+        lat, long = self.editor.to_lat_lon(self.get_xc(), self.get_yc())
+
+        # if abs(self.lat - lat) > 1e-8:
+        #     print(f"LAT MOVED: {self.lat}, new: {lat}")
+        #
+        # if abs(self.lon - long) > 1e-8:
+        #     print(f"LON MOVED: {self.lon}, new: {long}")
 
         self.lat = lat
         self.lon = long

{veragrid-5.6.18 → veragrid-5.6.20}/VeraGrid/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -2097,6 +2097,10 @@ class GridMapWidget(BaseDiagramWidget):
             merging_substation.remove_function_from_schematic_and_db()
 
     def consolidate_object_coordinates(self):
+        """
+
+        :return:
+        """
         selected_lines = self.get_selected_line_segments_tup()
         selected_substations = self.get_selected_substations_tup()
         selected_generators = self.get_selected_generators_tup()
@@ -3128,3 +3132,30 @@ def generate_map_diagram(
 
     return diagram
 
+
+def generate_map_diagram2(circuit: MultiCircuit):
+    return generate_map_diagram(
+        substations=circuit.get_substations(),
+        voltage_levels=circuit.get_voltage_levels(),
+        lines=circuit.get_lines(),
+        dc_lines=circuit.get_dc_lines(),
+        hvdc_lines=circuit.get_hvdc(),
+        fluid_nodes=circuit.get_fluid_nodes(),
+        fluid_paths=circuit.get_fluid_paths(),
+        external_grids=circuit.external_grids,
+        static_generators=circuit.static_generators,
+        loads=circuit.loads,
+        batteries=circuit.batteries ,
+        generators=circuit.generators,
+        prog_func=None,
+        text_func=None,
+        name='Map diagram',
+        use_flow_based_width=False,
+        min_branch_width=0.01,
+        max_branch_width=0.02,
+        min_bus_width=0.1,
+        max_bus_width=0.2,
+        arrow_size=0.015,
+        palette=Colormaps.VeraGrid,
+        default_bus_voltage=20
+    )

{veragrid-5.6.18 → veragrid-5.6.20}/VeraGrid/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -4608,12 +4608,19 @@ class SchematicWidget(BaseDiagramWidget):
         :param buses: List or Set of Buses
         """
 
+        # Extract voltage levels from the input buses to restrict expansion
+        # This prevents expanding into the external network when drawing voltage level conversions
+        voltage_levels = {b.voltage_level for b in buses if b.voltage_level is not None}
+
         (buses,
          lines, dc_lines, transformers2w,
          transformers3w, windings, hvdc_lines,
          vsc_converters, upfc_devices,
          series_reactances, switches,
-         fluid_nodes, fluid_paths) = get_devices_to_expand(circuit=self.circuit, buses=buses, max_level=5)
+         fluid_nodes, fluid_paths) = get_devices_to_expand(circuit=self.circuit,
+                                                           buses=buses,
+                                                           max_level=5,
+                                                           restrict_to_voltage_levels=voltage_levels)
 
         # Draw schematic subset
         diagram = generate_schematic_diagram(buses=list(buses),
@@ -5088,24 +5095,30 @@ def generate_grid_diagram(circuit: MultiCircuit,
                                       name=name)
 
 
-def get_devices_to_expand(circuit: MultiCircuit, buses: List[Bus], max_level: int = 1) -> Tuple[List[Bus],
-List[Line],
-List[DcLine],
-List[Transformer2W],
-List[Transformer3W],
-List[Winding],
-List[HvdcLine],
-List[VSC],
-List[UPFC],
-List[SeriesReactance],
-List[Switch],
-List[FluidNode],
-List[FluidPath]]:
+def get_devices_to_expand(circuit: MultiCircuit,
+                          buses: List[Bus],
+                          max_level: int = 1,
+                          restrict_to_voltage_levels: Set | None = None) -> Tuple[List[Bus],
+                                                                                   List[Line],
+                                                                                   List[DcLine],
+                                                                                   List[Transformer2W],
+                                                                                   List[Transformer3W],
+                                                                                   List[Winding],
+                                                                                   List[HvdcLine],
+                                                                                   List[VSC],
+                                                                                   List[UPFC],
+                                                                                   List[SeriesReactance],
+                                                                                   List[Switch],
+                                                                                   List[FluidNode],
+                                                                                   List[FluidPath]]:
     """
     get lists of devices to expand given a root bus
     :param circuit: MultiCircuit
     :param buses: List of Bus
     :param max_level: max expansion level
+    :param restrict_to_voltage_levels: If provided, only expand to buses within these voltage levels.
+                                       This prevents expansion into the external network when drawing
+                                       voltage level conversions.
     :return:
     """
 
@@ -5175,8 +5188,15 @@ List[FluidPath]]:
                     other_bus = None
 
                 if other_bus not in visited:
-                    bus_pool.append((other_bus, level + 1))
-                    visited.add(other_bus)
+                    # If voltage level restriction is active, only follow to buses within allowed voltage levels
+                    should_expand = True
+                    if restrict_to_voltage_levels is not None:
+                        other_vl = other_bus.voltage_level if other_bus is not None else None
+                        should_expand = other_vl in restrict_to_voltage_levels
+
+                    if should_expand:
+                        bus_pool.append((other_bus, level + 1))
+                        visited.add(other_bus)
 
     # sort Branches
     lines: List[Line] = list()