GridCal 5.1.49__tar.gz → 5.1.50__tar.gz

{GridCal-5.1.49 → GridCal-5.1.50}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -30,6 +30,7 @@ from PySide6.QtCore import (Qt, QSize, QRect, QMimeData, QIODevice, QByteArray,
 from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel, QStandardItem, QColor,
                            QDropEvent, QWheelEvent)
 
+from GridCal.Gui.SubstationDesigner.substation_designer import SubstationDesigner
 from GridCalEngine.Devices.Diagrams.map_location import MapLocation
 from GridCalEngine.Devices.Substation import Bus
 from GridCalEngine.Devices.Branches.line import Line
@@ -857,15 +858,46 @@ class GridMapWidget(BaseDiagramWidget):
             y0 = point0.y()
             lat, lon = self.to_lat_lon(x=x0, y=y0)
 
-            # print(f"Dropped at x:{x0}, y:{y0}, lat:{lat}, lon:{lon}")
-
             if obj_type == self.library_model.get_substation_mime_data():
-                api_object = Substation(name=f"Substation {self.circuit.get_substation_number()}",
-                                        latitude=lat,
-                                        longitude=lon)
-                self.circuit.add_substation(obj=api_object)
-                substation_graphics = self.add_api_substation(api_object=api_object, lat=lat, lon=lon)
-                substation_graphics.add_voltage_level()
+                self.create_substation_with_dialogue(lat=lat, lon=lon)
+
+    def create_substation_with_dialogue(self, lat, lon):
+        """
+        Create a substation using the dialogue
+        :param lat:
+        :param lon:
+        :return:
+        """
+        kv = self.gui.get_default_voltage()
+        dlg = SubstationDesigner(grid=self.circuit, default_voltage=kv)
+        dlg.exec()
+        if dlg.was_ok():
+
+            # create the SE
+            se_object = Substation(name=dlg.get_name(), latitude=lat, longitude=lon)
+
+            self.circuit.add_substation(obj=se_object)
+            substation_graphics = self.add_api_substation(api_object=se_object, lat=lat, lon=lon)
+
+            for vl_template in dlg.get_voltage_levels():
+
+                # substation_graphics.add_voltage_level()
+                vl = VoltageLevel(name=f"{se_object.name} @{kv}KV VL",
+                                  Vnom=vl_template.voltage,
+                                  substation=se_object)
+                self.circuit.add_voltage_level(vl)
+
+                bus = Bus(name=f"{se_object.name} @{kv}KV bus",
+                          Vnom=vl_template.voltage,
+                          substation=se_object,
+                          voltage_level=vl)
+                self.circuit.add_bus(obj=bus)
+
+                # add the vl graphics
+                self.add_api_voltage_level(substation_graphics=substation_graphics, api_object=vl)
+
+            # sort voltage levels
+            substation_graphics.sort_voltage_levels()
 
     def wheelEvent(self, event: QWheelEvent):
         """
@@ -874,12 +906,12 @@ class GridMapWidget(BaseDiagramWidget):
         :return:
         """
 
-        # SANTIAGO: NO TOCAR ESTO ES EL COMPORTAMIENTO DESEADO
+        # SANTIAGO: DO NOT TOUCH, THIS IS THE DESIRED BEHAVIOUR
         self.update_device_sizes()
 
-    def get_branch_width(self):
+    def get_branch_width(self) -> float:
         """
-
+        Get the desired branch width
         :return:
         """
         max_zoom = self.map.max_level
@@ -888,9 +920,9 @@ class GridMapWidget(BaseDiagramWidget):
         scale = self.diagram.min_branch_width + (zoom - min_zoom) / (max_zoom - min_zoom)
         return scale
 
-    def update_device_sizes(self):
+    def update_device_sizes(self) -> None:
         """
-
+        Updat ethe devices' sizes
         :return:
         """
 

{GridCal-5.1.49 → GridCal-5.1.50}/GridCal/Gui/Diagrams/MapWidget/map_widget.py

@@ -469,12 +469,12 @@ class MapWidget(QWidget):
         self.view_tlat = 0
 
         # some cursors
-        self.standard_cursor = QCursor(Qt.ArrowCursor)
-        self.box_select_cursor = QCursor(Qt.CrossCursor)
-        self.wait_cursor = QCursor(Qt.WaitCursor)
-        self.drag_cursor = QCursor(Qt.OpenHandCursor)
+        self.standard_cursor = QCursor(Qt.CursorShape.ArrowCursor)
+        self.box_select_cursor = QCursor(Qt.CursorShape.CrossCursor)
+        self.wait_cursor = QCursor(Qt.CursorShape.WaitCursor)
+        self.drag_cursor = QCursor(Qt.CursorShape.OpenHandCursor)
 
-        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         self.setMinimumSize(self.tile_width, self.tile_height)
 
         self.setMouseTracking(True)
@@ -672,9 +672,9 @@ class MapWidget(QWidget):
         self.setCursor(self.default_cursor)
 
         b = event.button()
-        if b == Qt.NoButton:
+        if b == Qt.MouseButton.NoButton:
             pass
-        elif b == Qt.LeftButton:
+        elif b == Qt.MouseButton.LeftButton:
             self.left_mbutton_down = False
 
             if self.start_drag_x is None:
@@ -688,10 +688,10 @@ class MapWidget(QWidget):
             longitude, latitude = self.view_to_geo(x, y)
             self.position_callback(latitude, longitude, x, y)
 
-        elif b == Qt.MidButton:
+        elif b == Qt.MouseButton.MiddleButton:
             self.mid_mbutton_down = False
 
-        elif b == Qt.RightButton:
+        elif b == Qt.MouseButton.RightButton:
             self.right_mbutton_down = False
 
         else:
@@ -705,13 +705,13 @@ class MapWidget(QWidget):
         :return:
         """
         b = event.button()
-        if b == Qt.NoButton:
+        if b == Qt.MouseButton.NoButton:
             pass
-        elif b == Qt.LeftButton:
+        elif b == Qt.MouseButton.LeftButton:
             pass
-        elif b == Qt.MidButton:
+        elif b == Qt.MouseButton.MiddleButton:
             pass
-        elif b == Qt.RightButton:
+        elif b == Qt.MouseButton.RightButton:
             pass
         else:
             pass
@@ -781,7 +781,7 @@ class MapWidget(QWidget):
     def keyPressEvent(self, event: QKeyEvent):
         """Capture a key press."""
 
-        if event.key() == Qt.Key_Shift:
+        if event.key() == Qt.Key.Key_Shift:
             self.shift_down = True
             self.default_cursor = self.box_select_cursor
             self.setCursor(self.default_cursor)
@@ -792,7 +792,7 @@ class MapWidget(QWidget):
         """Capture a key release."""
 
         key = event.key()
-        if event.key() == Qt.Key_Shift:
+        if event.key() == Qt.Key.Key_Shift:
             self.shift_down = False
             self.default_cursor = self.standard_cursor
             self.setCursor(self.default_cursor)

{GridCal-5.1.49 → GridCal-5.1.50}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -18,7 +18,6 @@ from __future__ import annotations
 from typing import List, Dict, Union, Tuple, Callable, TYPE_CHECKING
 import numpy as np
 import cv2
-from docutils.nodes import title
 from matplotlib import pyplot as plt
 
 from PySide6.QtCore import Qt

{GridCal-5.1.49 → GridCal-5.1.50}/GridCal/Gui/Main/MainWindow.py

@@ -4191,20 +4191,42 @@ class Ui_mainWindow(object):
         self.frame_77.setFrameShadow(QFrame.Raised)
         self.gridLayout_11 = QGridLayout(self.frame_77)
         self.gridLayout_11.setObjectName(u"gridLayout_11")
-        self.label_115 = QLabel(self.frame_77)
-        self.label_115.setObjectName(u"label_115")
+        self.raw_export_version_comboBox = QComboBox(self.frame_77)
+        self.raw_export_version_comboBox.setObjectName(u"raw_export_version_comboBox")
+
+        self.gridLayout_11.addWidget(self.raw_export_version_comboBox, 10, 1, 1, 1)
+
+        self.model_version_label = QLabel(self.frame_77)
+        self.model_version_label.setObjectName(u"model_version_label")
+        self.model_version_label.setFont(font1)
+
+        self.gridLayout_11.addWidget(self.model_version_label, 4, 0, 1, 2)
+
+        self.label_131 = QLabel(self.frame_77)
+        self.label_131.setObjectName(u"label_131")
         palette42 = QPalette()
         palette42.setBrush(QPalette.Active, QPalette.WindowText, brush)
         palette42.setBrush(QPalette.Inactive, QPalette.WindowText, brush5)
         palette42.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.label_115.setPalette(palette42)
-        self.label_115.setFont(font4)
+        self.label_131.setPalette(palette42)
+        self.label_131.setFont(font4)
 
-        self.gridLayout_11.addWidget(self.label_115, 0, 1, 1, 1)
+        self.gridLayout_11.addWidget(self.label_131, 8, 1, 1, 1)
 
-        self.verticalSpacer_20 = QSpacerItem(20, 436, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        self.label_145 = QLabel(self.frame_77)
+        self.label_145.setObjectName(u"label_145")
+        self.label_145.setMinimumSize(QSize(24, 24))
+        self.label_145.setMaximumSize(QSize(24, 24))
+        self.label_145.setPixmap(QPixmap(u":/Icons/icons/new2c.svg"))
+        self.label_145.setScaledContents(True)
+
+        self.gridLayout_11.addWidget(self.label_145, 8, 0, 1, 1)
 
-        self.gridLayout_11.addItem(self.verticalSpacer_20, 7, 1, 1, 1)
+        self.label_39 = QLabel(self.frame_77)
+        self.label_39.setObjectName(u"label_39")
+        self.label_39.setFont(font1)
+
+        self.gridLayout_11.addWidget(self.label_39, 2, 0, 1, 2)
 
         self.label_136 = QLabel(self.frame_77)
         self.label_136.setObjectName(u"label_136")
@@ -4215,24 +4237,19 @@ class Ui_mainWindow(object):
 
         self.gridLayout_11.addWidget(self.label_136, 0, 0, 1, 1)
 
-        self.label_39 = QLabel(self.frame_77)
-        self.label_39.setObjectName(u"label_39")
-        self.label_39.setFont(font1)
+        self.file_information_label = QLabel(self.frame_77)
+        self.file_information_label.setObjectName(u"file_information_label")
+        self.file_information_label.setFont(font1)
+        self.file_information_label.setWordWrap(True)
+        self.file_information_label.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByKeyboard|Qt.TextSelectableByMouse)
 
-        self.gridLayout_11.addWidget(self.label_39, 2, 0, 1, 2)
+        self.gridLayout_11.addWidget(self.file_information_label, 3, 0, 1, 2)
 
-        self.line_28 = QFrame(self.frame_77)
-        self.line_28.setObjectName(u"line_28")
-        palette43 = QPalette()
-        palette43.setBrush(QPalette.Active, QPalette.WindowText, brush3)
-        palette43.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
-        palette43.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.line_28.setPalette(palette43)
-        self.line_28.setFrameShadow(QFrame.Plain)
-        self.line_28.setLineWidth(4)
-        self.line_28.setFrameShape(QFrame.Shape.HLine)
+        self.user_name_label = QLabel(self.frame_77)
+        self.user_name_label.setObjectName(u"user_name_label")
+        self.user_name_label.setFont(font1)
 
-        self.gridLayout_11.addWidget(self.line_28, 1, 0, 1, 2)
+        self.gridLayout_11.addWidget(self.user_name_label, 5, 0, 1, 2)
 
         self.saveResultsCheckBox = QCheckBox(self.frame_77)
         self.saveResultsCheckBox.setObjectName(u"saveResultsCheckBox")
@@ -4240,25 +4257,57 @@ class Ui_mainWindow(object):
 
         self.gridLayout_11.addWidget(self.saveResultsCheckBox, 6, 0, 1, 2)
 
-        self.user_name_label = QLabel(self.frame_77)
-        self.user_name_label.setObjectName(u"user_name_label")
-        self.user_name_label.setFont(font1)
+        self.label_112 = QLabel(self.frame_77)
+        self.label_112.setObjectName(u"label_112")
+        self.label_112.setFont(font1)
 
-        self.gridLayout_11.addWidget(self.user_name_label, 5, 0, 1, 2)
+        self.gridLayout_11.addWidget(self.label_112, 10, 0, 1, 1)
 
-        self.model_version_label = QLabel(self.frame_77)
-        self.model_version_label.setObjectName(u"model_version_label")
-        self.model_version_label.setFont(font1)
+        self.label_115 = QLabel(self.frame_77)
+        self.label_115.setObjectName(u"label_115")
+        palette43 = QPalette()
+        palette43.setBrush(QPalette.Active, QPalette.WindowText, brush)
+        palette43.setBrush(QPalette.Inactive, QPalette.WindowText, brush5)
+        palette43.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.label_115.setPalette(palette43)
+        self.label_115.setFont(font4)
 
-        self.gridLayout_11.addWidget(self.model_version_label, 4, 0, 1, 2)
+        self.gridLayout_11.addWidget(self.label_115, 0, 1, 1, 1)
 
-        self.file_information_label = QLabel(self.frame_77)
-        self.file_information_label.setObjectName(u"file_information_label")
-        self.file_information_label.setFont(font1)
-        self.file_information_label.setWordWrap(True)
-        self.file_information_label.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByKeyboard|Qt.TextSelectableByMouse)
+        self.verticalSpacer_20 = QSpacerItem(20, 436, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
-        self.gridLayout_11.addWidget(self.file_information_label, 3, 0, 1, 2)
+        self.gridLayout_11.addItem(self.verticalSpacer_20, 11, 1, 1, 1)
+
+        self.line_28 = QFrame(self.frame_77)
+        self.line_28.setObjectName(u"line_28")
+        palette44 = QPalette()
+        palette44.setBrush(QPalette.Active, QPalette.WindowText, brush3)
+        palette44.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
+        palette44.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.line_28.setPalette(palette44)
+        self.line_28.setFrameShadow(QFrame.Plain)
+        self.line_28.setLineWidth(4)
+        self.line_28.setFrameShape(QFrame.Shape.HLine)
+
+        self.gridLayout_11.addWidget(self.line_28, 1, 0, 1, 2)
+
+        self.line_33 = QFrame(self.frame_77)
+        self.line_33.setObjectName(u"line_33")
+        palette45 = QPalette()
+        palette45.setBrush(QPalette.Active, QPalette.WindowText, brush3)
+        palette45.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
+        palette45.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.line_33.setPalette(palette45)
+        self.line_33.setFrameShadow(QFrame.Plain)
+        self.line_33.setLineWidth(4)
+        self.line_33.setFrameShape(QFrame.Shape.HLine)
+
+        self.gridLayout_11.addWidget(self.line_33, 9, 0, 1, 2)
+
+        self.label_24 = QLabel(self.frame_77)
+        self.label_24.setObjectName(u"label_24")
+
+        self.gridLayout_11.addWidget(self.label_24, 7, 0, 1, 1)
 
 
         self.horizontalLayout_40.addWidget(self.frame_77)
@@ -4272,38 +4321,20 @@ class Ui_mainWindow(object):
         self.gridLayout_5.setObjectName(u"gridLayout_5")
         self.label_134 = QLabel(self.frame_79)
         self.label_134.setObjectName(u"label_134")
-        palette44 = QPalette()
-        palette44.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette44.setBrush(QPalette.Inactive, QPalette.WindowText, brush5)
-        palette44.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.label_134.setPalette(palette44)
+        palette46 = QPalette()
+        palette46.setBrush(QPalette.Active, QPalette.WindowText, brush)
+        palette46.setBrush(QPalette.Inactive, QPalette.WindowText, brush5)
+        palette46.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.label_134.setPalette(palette46)
         self.label_134.setFont(font4)
 
         self.gridLayout_5.addWidget(self.label_134, 0, 1, 1, 2)
 
-        self.label_135 = QLabel(self.frame_79)
-        self.label_135.setObjectName(u"label_135")
-        self.label_135.setFont(font1)
-
-        self.gridLayout_5.addWidget(self.label_135, 2, 0, 1, 3)
-
-        self.cgmes_profiles_listView = QListView(self.frame_79)
-        self.cgmes_profiles_listView.setObjectName(u"cgmes_profiles_listView")
-        self.cgmes_profiles_listView.setFont(font1)
-
-        self.gridLayout_5.addWidget(self.cgmes_profiles_listView, 12, 0, 1, 3)
-
-        self.label_90 = QLabel(self.frame_79)
-        self.label_90.setObjectName(u"label_90")
-        self.label_90.setFont(font1)
-
-        self.gridLayout_5.addWidget(self.label_90, 8, 0, 1, 3)
-
-        self.cgmes_version_comboBox = QComboBox(self.frame_79)
-        self.cgmes_version_comboBox.setObjectName(u"cgmes_version_comboBox")
-        self.cgmes_version_comboBox.setFont(font1)
+        self.cgmes_boundary_set_label = QLabel(self.frame_79)
+        self.cgmes_boundary_set_label.setObjectName(u"cgmes_boundary_set_label")
+        self.cgmes_boundary_set_label.setFont(font1)
 
-        self.gridLayout_5.addWidget(self.cgmes_version_comboBox, 3, 0, 1, 3)
+        self.gridLayout_5.addWidget(self.cgmes_boundary_set_label, 9, 0, 1, 2)
 
         self.label_139 = QLabel(self.frame_79)
         self.label_139.setObjectName(u"label_139")
@@ -4311,12 +4342,6 @@ class Ui_mainWindow(object):
 
         self.gridLayout_5.addWidget(self.label_139, 11, 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.cgmes_single_profile_per_file_checkBox.setFont(font1)
-
-        self.gridLayout_5.addWidget(self.cgmes_single_profile_per_file_checkBox, 13, 0, 1, 3)
-
         self.label_137 = QLabel(self.frame_79)
         self.label_137.setObjectName(u"label_137")
         self.label_137.setMinimumSize(QSize(24, 24))
@@ -4326,19 +4351,36 @@ class Ui_mainWindow(object):
 
         self.gridLayout_5.addWidget(self.label_137, 0, 0, 1, 1)
 
+        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_135 = QLabel(self.frame_79)
+        self.label_135.setObjectName(u"label_135")
+        self.label_135.setFont(font1)
+
+        self.gridLayout_5.addWidget(self.label_135, 2, 0, 1, 3)
+
         self.line_31 = QFrame(self.frame_79)
         self.line_31.setObjectName(u"line_31")
-        palette45 = QPalette()
-        palette45.setBrush(QPalette.Active, QPalette.WindowText, brush3)
-        palette45.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
-        palette45.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.line_31.setPalette(palette45)
+        palette47 = QPalette()
+        palette47.setBrush(QPalette.Active, QPalette.WindowText, brush3)
+        palette47.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
+        palette47.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.line_31.setPalette(palette47)
         self.line_31.setFrameShadow(QFrame.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.cgmes_profiles_listView = QListView(self.frame_79)
+        self.cgmes_profiles_listView.setObjectName(u"cgmes_profiles_listView")
+        self.cgmes_profiles_listView.setFont(font1)
+
+        self.gridLayout_5.addWidget(self.cgmes_profiles_listView, 12, 0, 1, 3)
+
         self.selectCGMESBoundarySetButton = QPushButton(self.frame_79)
         self.selectCGMESBoundarySetButton.setObjectName(u"selectCGMESBoundarySetButton")
         self.selectCGMESBoundarySetButton.setMaximumSize(QSize(80, 16777215))
@@ -4346,16 +4388,28 @@ class Ui_mainWindow(object):
 
         self.gridLayout_5.addWidget(self.selectCGMESBoundarySetButton, 9, 2, 1, 1)
 
-        self.cgmes_boundary_set_label = QLabel(self.frame_79)
-        self.cgmes_boundary_set_label.setObjectName(u"cgmes_boundary_set_label")
-        self.cgmes_boundary_set_label.setFont(font1)
+        self.cgmes_version_comboBox = QComboBox(self.frame_79)
+        self.cgmes_version_comboBox.setObjectName(u"cgmes_version_comboBox")
+        self.cgmes_version_comboBox.setFont(font1)
 
-        self.gridLayout_5.addWidget(self.cgmes_boundary_set_label, 9, 0, 1, 2)
+        self.gridLayout_5.addWidget(self.cgmes_version_comboBox, 3, 0, 1, 3)
 
-        self.label_102 = QLabel(self.frame_79)
-        self.label_102.setObjectName(u"label_102")
+        self.label_90 = QLabel(self.frame_79)
+        self.label_90.setObjectName(u"label_90")
+        self.label_90.setFont(font1)
 
-        self.gridLayout_5.addWidget(self.label_102, 10, 0, 1, 1)
+        self.gridLayout_5.addWidget(self.label_90, 8, 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.cgmes_single_profile_per_file_checkBox.setFont(font1)
+
+        self.gridLayout_5.addWidget(self.cgmes_single_profile_per_file_checkBox, 13, 0, 1, 3)
+
+        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, 1)
 
 
         self.horizontalLayout_40.addWidget(self.frame_79)
@@ -5682,31 +5736,39 @@ class Ui_mainWindow(object):
 #if QT_CONFIG(tooltip)
         self.file_tab.setToolTip(QCoreApplication.translate("mainWindow", u"File settings", None))
 #endif // QT_CONFIG(tooltip)
-        self.label_115.setText(QCoreApplication.translate("mainWindow", u"File Information", None))
-        self.label_136.setText("")
+        self.model_version_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
+        self.label_131.setText(QCoreApplication.translate("mainWindow", u"Raw files", None))
+        self.label_145.setText("")
         self.label_39.setText(QCoreApplication.translate("mainWindow", u"File path", None))
+        self.label_136.setText("")
+        self.file_information_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
+        self.user_name_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
 #if QT_CONFIG(tooltip)
         self.saveResultsCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"If checked, the results are stored inside the gridcal file in a compressed format.", None))
 #endif // QT_CONFIG(tooltip)
         self.saveResultsCheckBox.setText(QCoreApplication.translate("mainWindow", u"Save results in .gridcal files", None))
-        self.user_name_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
-        self.model_version_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
-        self.file_information_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
+        self.label_112.setText(QCoreApplication.translate("mainWindow", u"Export version", None))
+        self.label_115.setText(QCoreApplication.translate("mainWindow", u"File Information", None))
+        self.label_24.setText("")
         self.label_134.setText(QCoreApplication.translate("mainWindow", u"CGMES", None))
-        self.label_135.setText(QCoreApplication.translate("mainWindow", u"Export version", None))
-        self.label_90.setText(QCoreApplication.translate("mainWindow", u"Boundary set", None))
+#if QT_CONFIG(tooltip)
+        self.cgmes_boundary_set_label.setToolTip(QCoreApplication.translate("mainWindow", u"Path of the CGMES default boundary set (single zip file)", None))
+#endif // QT_CONFIG(tooltip)
+        self.cgmes_boundary_set_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
         self.label_139.setText(QCoreApplication.translate("mainWindow", u"Profiles to export", None))
-        self.cgmes_single_profile_per_file_checkBox.setText(QCoreApplication.translate("mainWindow", u"One file per profile", None))
         self.label_137.setText("")
+        self.label_102.setText("")
+        self.label_135.setText(QCoreApplication.translate("mainWindow", u"Export version", None))
 #if QT_CONFIG(tooltip)
         self.selectCGMESBoundarySetButton.setToolTip(QCoreApplication.translate("mainWindow", u"Select the CGMES boundary set (single zip file)", None))
 #endif // QT_CONFIG(tooltip)
         self.selectCGMESBoundarySetButton.setText(QCoreApplication.translate("mainWindow", u"Select", None))
+        self.label_90.setText(QCoreApplication.translate("mainWindow", u"Boundary set", None))
+        self.cgmes_single_profile_per_file_checkBox.setText(QCoreApplication.translate("mainWindow", u"One file per profile", None))
 #if QT_CONFIG(tooltip)
-        self.cgmes_boundary_set_label.setToolTip(QCoreApplication.translate("mainWindow", u"Path of the CGMES default boundary set (single zip file)", None))
+        self.cgmes_map_regions_like_raw_checkBox.setToolTip(QCoreApplication.translate("mainWindow", 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_boundary_set_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
-        self.label_102.setText("")
+        self.cgmes_map_regions_like_raw_checkBox.setText(QCoreApplication.translate("mainWindow", u"Map regions like raw files", None))
         self.settings_tabWidget.setTabText(self.settings_tabWidget.indexOf(self.file_tab), QCoreApplication.translate("mainWindow", u"File", None))
 #if QT_CONFIG(tooltip)
         self.settings_tabWidget.setTabToolTip(self.settings_tabWidget.indexOf(self.file_tab), QCoreApplication.translate("mainWindow", u"File related settings", None))

{GridCal-5.1.49 → GridCal-5.1.50}/GridCal/Gui/Main/SubClasses/Model/diagrams.py

@@ -290,6 +290,13 @@ class DiagramsMain(CompiledArraysMain):
         # Set context menu policy to CustomContextMenu
         self.ui.diagramsListView.setContextMenuPolicy(QtGui.Qt.ContextMenuPolicy.CustomContextMenu)
 
+    def get_default_voltage(self) -> float:
+        """
+        Get the defualt marked voltage
+        :return:
+        """
+        return self.ui.defaultBusVoltageSpinBox.value()
+
     def auto_layout(self):
         """
         Automatic layout of the nodes

{GridCal-5.1.49 → GridCal-5.1.50}/GridCal/Gui/Main/SubClasses/io.py

@@ -83,6 +83,8 @@ class IoMain(ConfigurationMain):
         self.ui.cgmes_profiles_listView.setModel(gf.get_list_model(list(self.cgmes_profiles_dict.keys()),
                                                                    checks=True, check_value=True))
 
+        self.ui.raw_export_version_comboBox.addItems(["33", "35"])
+
         self.ui.actionNew_project.triggered.connect(self.new_project)
         self.ui.actionOpen_file.triggered.connect(self.open_file)
         self.ui.actionAdd_circuit.triggered.connect(self.add_circuit)
@@ -290,6 +292,12 @@ class IoMain(ConfigurationMain):
         :return: Nothing
         """
         if len(filenames) > 0:
+
+            for fname in filenames:
+                if not os.path.exists(fname):
+                    error_msg(text=f"The file does not exists :(\n{fname}", title="File opening")
+                    return
+
             self.file_name = filenames[0]
 
             # store the working directory
@@ -688,13 +696,19 @@ class IoMain(ConfigurationMain):
 
         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()
+
+        raw_version = self.ui.raw_export_version_comboBox.currentText()
+
         options = filedrv.FileSavingOptions(cgmes_boundary_set=self.current_boundary_set,
                                             simulation_drivers=self.get_simulations(),
                                             sessions_data=sessions_data,
                                             dictionary_of_json_files=json_files,
                                             cgmes_version=cgmes_version,
                                             cgmes_profiles=cgmes_profiles,
-                                            one_file_per_profile=one_file_per_profile)
+                                            cgmes_one_file_per_profile=one_file_per_profile,
+                                            cgmes_map_areas_like_raw=cgmes_map_areas_like_raw,
+                                            raw_version=raw_version)
 
         return options
 

{GridCal-5.1.49 → GridCal-5.1.50}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -2109,7 +2109,7 @@ class SimulationsMain(TimeEventsMain):
         idx_br = info.idx_branches
 
         if len(idx_from) == 0:
-            error_msg('The area "from" has no buses!')
+            error_msg('The "from" aggregation has no buses!')
             return None
 
         if len(idx_to) == 0: