GridCal 5.3.21__tar.gz → 5.3.23__tar.gz

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -6,7 +6,8 @@ from __future__ import annotations
 import webbrowser
 from typing import List, TYPE_CHECKING, Tuple
 from PySide6 import QtWidgets
-from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsRectItem
+from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsRectItem, \
+    QMessageBox
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor
 from GridCal.Gui.Diagrams.MapWidget.Substation.node_template import NodeTemplate
@@ -20,10 +21,11 @@ from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices import VoltageLevel
 from GridCalEngine.Devices.Substation.substation import Substation
 from GridCalEngine.enumerations import DeviceType
+from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
+from GridCal.Gui.Diagrams.SchematicWidget import schematic_widget
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.MapWidget.grid_map_widget import GridMapWidget
-    from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
 
 
 class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
@@ -108,7 +110,10 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         :param se: other SubstationGraphicItem
         """
         self._callbacks += se._callbacks
-        self.voltage_level_graphics += se.voltage_level_graphics
+        for vl_graphic in se.voltage_level_graphics:
+            self.register_voltage_level(vl=vl_graphic.get_copy(new_parent=self))
+
+        self.sort_voltage_levels()
 
     def set_size(self, r: float):
         """
@@ -237,6 +242,23 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
                                            longitude=long,
                                            graphic_object=self)
 
+    def refresh(self, pos: QPointF):
+        """
+        This function refreshes the x, y coordinates of the graphic item
+        Returns:
+
+        """
+
+        x = pos.x() - self.rect().width() / 2
+        y = pos.y() - self.rect().height() / 2
+        self.setRect(x, y, self.rect().width(), self.rect().height())
+        self.set_callbacks(pos.x(), pos.y())
+
+        for vl_graphics in self.voltage_level_graphics:
+            vl_graphics.center_on_substation()
+
+        self.update_position_at_the_diagram()  # always update
+
     def get_center_pos(self) -> QPointF:
         """
         Get the center position
@@ -254,22 +276,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         if self.hovered:
             # super().mouseMoveEvent(event)
             pos = self.mapToParent(event.pos())
-            x = pos.x() - self.rect().width() / 2
-            y = pos.y() - self.rect().height() / 2
-            self.setRect(x, y, self.rect().width(), self.rect().height())
-            self.set_callbacks(pos.x(), pos.y())
-
-            for vl_graphics in self.voltage_level_graphics:
-                vl_graphics.center_on_substation()
-
-            self.update_position_at_the_diagram()  # always update
-
-        # QGraphicsRectItem.mouseMoveEvent(self, event)
-        # pos = self.mapToParent(event.pos())
-        # x = pos.x() + self.rect().width() / 2
-        # y = pos.y() + self.rect().height() / 2
-        # self.set_callbacks(x, y)
-        # self.update_position_at_the_diagram()  # always update
+            self.refresh(pos=pos)
 
     def mousePressEvent(self, event: QGraphicsSceneMouseEvent):
         """
@@ -413,7 +420,8 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
             "Remove substation from schematic")
 
         if ok:
-            self.editor.remove_substation(substation=self, delete_from_db=False)
+            self.editor.remove_substation(api_object=self.api_object, delete_from_db=False, substation_buses=[],
+                                          voltage_levels=[])
 
     def remove_function_from_schematic_and_db(self) -> None:
         """
@@ -514,8 +522,6 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         dialog.setModal(True)
         dialog.exec()
 
-
-
     def move_to_api_coordinates(self):
         """
         Function to move the graphics to the Database location
@@ -544,7 +550,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         dlg.exec()
 
         if dlg.is_accepted:
-
+            selected_buses = []
             deleted_api_objs: List[Substation] = list()
 
             # Collect all codes to merge
@@ -556,15 +562,18 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
                 if merged_codes == "":
                     merged_codes = se_graphics.api_object.code
                 else:
-                    merged_codes = merged_codes + ',' + se_graphics.api_object.code
+                    if se_graphics.api_object.code != "":
+                        merged_codes = merged_codes + ',' + se_graphics.api_object.code
 
                 deleted_api_objs.append(se_graphics.api_object)
 
                 if se_graphics != self:
                     self.merge(se=se_graphics)
-                    self.editor.remove_substation(substation=se_graphics,
-                                                  delete_from_db=True,
-                                                  delete_connections=False)
+                    sub = self.editor.graphics_manager.delete_device(se_graphics.api_object)
+                    self.editor.map.diagram_scene.removeItem(sub)
+                    # self.editor.remove_substation(substation=se_graphics,
+                    #                               delete_from_db=True,
+                    #                               delete_connections=False)
 
             # Update the code of the base substation
             self.api_object.code = merged_codes  # Needed?
@@ -578,11 +587,14 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
             # re-index the stuff pointing at deleted api elements to this api object
             for vl in self.editor.circuit.voltage_levels:
                 if vl.substation in deleted_api_objs:
+                    print(f'{vl.substation.name} changed to {self.api_object.name} for {vl.name}')
                     vl.substation = self.api_object
 
             for bus in self.editor.circuit.buses:
                 if bus.substation in deleted_api_objs:
+                    print(f'{bus.substation.name} changed to {self.api_object.name} for {bus.name}')
                     bus.substation = self.api_object
+                    selected_buses.append(bus)
 
             # remove connections that are from and to the same substation
             for tpe in [DeviceType.LineDevice, DeviceType.DCLineDevice, DeviceType.HVDCLineDevice]:
@@ -590,7 +602,54 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
                     if elm.api_object.get_substation_from() == elm.api_object.get_substation_to():
                         self.editor.remove_branch_graphic(elm, delete_from_db=True)
 
-        self.update_position_at_the_diagram()  # always update
+            for substation in deleted_api_objs:
+                if substation == self.api_object:
+                    pass
+                else:
+                    self.editor.circuit.delete_substation(obj=substation)
+
+            self.refresh(pos=self.get_pos())  # always update
+
+            if len(selected_buses):
+
+                dlg = CheckListDialogue(
+                    objects_list=[f'Create schematic diagram for the recipient substation {self.api_object.name}',
+                                  f'Unify buses and voltage levels with the same nominal voltage in recipient '
+                                  f'substation {self.api_object.name}'],
+                    title=f"Finishing merging proces in substation{self.api_object.name}"
+                )
+                dlg.setModal(True)
+                dlg.exec()
+
+
+                if dlg.accepted:
+                    for index in dlg.selected_indices:
+                        if index == 0:
+                            diagram = schematic_widget.make_diagram_from_buses(circuit=self.editor.circuit,
+                                                                               buses=selected_buses,
+                                                                               name=self.api_object.name + " diagram")
+
+                            diagram_widget = schematic_widget.SchematicWidget(gui=self.editor.gui,
+                                                                              circuit=self.editor.circuit,
+                                                                              diagram=diagram,
+                                                                              default_bus_voltage=self.editor.gui.ui.defaultBusVoltageSpinBox.value(),
+                                                                              time_index=self.editor.gui.get_diagram_slider_index())
+
+                            self.editor.gui.add_diagram_widget_and_diagram(diagram_widget=diagram_widget,
+                                                                           diagram=diagram)
+                            self.editor.gui.set_diagrams_list_view()
+                            self.editor.gui.set_diagram_widget(widget=diagram_widget)
+                        elif index == 1:
+                            pass
+                            #TODO: Merge items
+                else:
+                    self.editor.gui.show_info_toast(
+                        message='Merge ended. There was no diagram produced. The buses and voltages were not unified.')
+
+            else:
+                self.editor.gui.show_info_toast(
+                    message='The substation merged have no associated buses. No schematic can be produced.')
+
 
     def new_substation_diagram(self):
         """

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Gui/Diagrams/MapWidget/Substation/voltage_level_graphic_item.py

@@ -149,6 +149,18 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
                                            longitude=long,
                                            graphic_object=self)
 
+    def get_copy(self, new_parent: SubstationGraphicItem):
+        """
+        Returns a copy of the VoltageLevelGraphicItem with a different parent
+        :param new_parent: New Substation Graphic item parent
+        :return: Copy of the VL Grpahic Item with new parent.
+        """
+        return VoltageLevelGraphicItem(parent=new_parent, editor=new_parent.editor, api_object=self.api_object,
+                                       r=self.radius / self.api_object.Vnom / 0.01, draw_labels=self.draw_labels)
+
+
+
+
     def mouseMoveEvent(self, event: QtWidgets.QGraphicsSceneMouseEvent) -> None:
         """
         Event handler for mouse move events.

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -2482,7 +2482,8 @@ def get_devices_to_expand(circuit: MultiCircuit, substations: List[Substation],
 
         if bus.voltage_level is not None:
             voltage_levels.add(bus.voltage_level)
-            substations_extended.add(bus.substation)
+            if bus.substation not in substations_extended:
+                substations_extended.add(bus.substation)
 
         if level < max_level:
 
@@ -2521,7 +2522,13 @@ def get_devices_to_expand(circuit: MultiCircuit, substations: List[Substation],
         else:
             raise Exception(f'Unrecognized branch type {obj.device_type.value}')
 
-    return list(substations_extended), list(voltage_levels), lines, dc_lines, hvdc_lines
+    list_substations_extended = list(substations_extended)
+
+    for substation in substations:
+        if substation not in list_substations_extended:
+            list_substations_extended.append(substation)
+
+    return list_substations_extended, list(voltage_levels), lines, dc_lines, hvdc_lines
 
 
 def make_diagram_from_substations(circuit: MultiCircuit,

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Gui/GridMerge/build_diff_tree.py

@@ -95,8 +95,8 @@ def populate_tree(tree_widget, base: MultiCircuit, diff: MultiCircuit,
 
                     child_item = QtWidgets.QTreeWidgetItem(
                         parent_item,
-                        [f"{elm.device_type.value}", "Mod", f"{elm.idtag}", f"{elm.name}",
-                         prop.name, str(base_val), str(new_val)]
+                        [f"{diff_name}", f"{elm.device_type.value}", "Mod", f"{elm.idtag}", 
+                         f"{elm.name}", prop.name, str(base_val), str(new_val)]
                     )
                     child_item.setCheckState(0, Qt.CheckState.Unchecked)
 

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Gui/Main/MainWindow.py

@@ -4603,6 +4603,11 @@ class Ui_mainWindow(object):
 
         self.horizontalLayout_8.addWidget(self.server_pwd_lineEdit)
 
+        self.secureServerConnectionCheckBox = QCheckBox(self.frame_2)
+        self.secureServerConnectionCheckBox.setObjectName(u"secureServerConnectionCheckBox")
+
+        self.horizontalLayout_8.addWidget(self.secureServerConnectionCheckBox)
+
         self.horizontalSpacer_7 = QSpacerItem(304, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_8.addItem(self.horizontalSpacer_7)
@@ -6030,6 +6035,7 @@ class Ui_mainWindow(object):
 #if QT_CONFIG(tooltip)
         self.server_pwd_lineEdit.setToolTip(QCoreApplication.translate("mainWindow", u"Type here the GridCal server password (ask your IT team)", None))
 #endif // QT_CONFIG(tooltip)
+        self.secureServerConnectionCheckBox.setText(QCoreApplication.translate("mainWindow", u"Secure", None))
         self.server_status_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
         self.settings_tabWidget.setTabText(self.settings_tabWidget.indexOf(self.tab_5), QCoreApplication.translate("mainWindow", u"Server", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.SettingsTab), QCoreApplication.translate("mainWindow", u"Settings", None))

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Gui/Main/SubClasses/Server/server.py

@@ -26,7 +26,7 @@ class ServerMain(BaseMainGui):
         BaseMainGui.__init__(self, parent=parent)
 
         # Server driver
-        self.server_driver: ServerDriver = ServerDriver(url="", port=0, pwd="")
+        self.server_driver: ServerDriver = ServerDriver(url="", port=0, pwd="", secure=False)
         self.server_driver.connected_signal.connect(self.server_connected)
         self.server_driver.done_signal.connect(self.post_start_stop_server)  # connect the post function
 
@@ -61,7 +61,8 @@ class ServerMain(BaseMainGui):
         return {"url": self.ui.server_url_lineEdit.text(),
                 "port": self.ui.server_port_spinBox.value(),
                 "user": "",
-                "pwd": self.ui.server_pwd_lineEdit.text()}
+                "pwd": self.ui.server_pwd_lineEdit.text(),
+                "secure": self.ui.secureServerConnectionCheckBox.isChecked(),}
 
     def save_server_config(self):
         """
@@ -81,6 +82,7 @@ class ServerMain(BaseMainGui):
         self.ui.server_port_spinBox.setValue(data.get("port", 8080))
         # "user": "",
         self.ui.server_pwd_lineEdit.setText(data.get("pwd", "1234"))
+        self.ui.secureServerConnectionCheckBox.setChecked(data.get("secure", True))
 
     def load_server_config(self) -> None:
         """
@@ -107,6 +109,7 @@ class ServerMain(BaseMainGui):
             self.server_driver.set_values(url=self.ui.server_url_lineEdit.text().strip(),
                                           port=self.ui.server_port_spinBox.value(),
                                           pwd=self.ui.server_pwd_lineEdit.text().strip(),
+                                          secure=self.ui.secureServerConnectionCheckBox.isChecked(),
                                           status_func=self.ui.server_status_label.setText)
 
             # save the last server config

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Gui/Main/SubClasses/Settings/configuration.py

@@ -179,7 +179,6 @@ class ConfigurationMain(ResultsMain):
                 }
             },
             "linear": {
-
                 "ptdf_threshold": self.ui.ptdf_threshold_doubleSpinBox,
                 "lodf_threshold": self.ui.lodf_threshold_doubleSpinBox
             },

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/Session/server_driver.py

@@ -147,7 +147,8 @@ class ServerDriver(QThread):
     sync_event = Signal()
     items_processed_event = Signal()
 
-    def __init__(self, url: str, port: int, pwd: str, sleep_time: int = 2, status_func: Callable[[str], None] = None):
+    def __init__(self, url: str, port: int, pwd: str, sleep_time: int = 2, status_func: Callable[[str], None] = None,
+                 secure: bool = False):
         """
         Constructor
         :param url: Server URL
@@ -163,6 +164,7 @@ class ServerDriver(QThread):
         self.pwd = pwd
         self.sleep_time = sleep_time
         self.status_func: Callable[[str], None] = status_func
+        self.secure = secure
         self.__running__ = False
 
         self.logger = Logger()
@@ -175,19 +177,23 @@ class ServerDriver(QThread):
         self.__cancel__ = False
         self.__pause__ = False
 
-    def set_values(self, url: str, port: int, pwd: str, sleep_time: int = 2, status_func: Callable[[str], None] = None):
+    def set_values(self, url: str, port: int, pwd: str, sleep_time: int = 2,
+                   secure: bool = False,
+                   status_func: Callable[[str], None] = None):
         """
         Set the values
         :param url: Server URL
         :param port: Server port
         :param pwd: Server password
         :param sleep_time: Sleep time (s)
+        :param secure: Use https?
         :param status_func: a text function pointer
         """
         self.url = url
         self.port = port
         self.pwd = pwd
         self.sleep_time = sleep_time
+        self.secure = secure
         self.status_func: Callable[[str], None] = status_func
         self.__running__ = False
         self.logger = Logger()
@@ -206,7 +212,10 @@ class ServerDriver(QThread):
         Base URL of the service
         :return:
         """
-        return f"https://{self.url}:{self.port}"
+        if self.secure:
+            return f"https://{self.url}:{self.port}"
+        else:
+            return f"http://{self.url}:{self.port}"
 
     def get_certificate_path(self):
 
@@ -504,9 +513,15 @@ class RemoteJobDriver(QThread):
         model_data = gather_model_as_jsons_for_communication(circuit=self.grid, instruction=self.instruction)
 
         try:
-            response = send_json_data(json_data=model_data,
-                                      endpoint_url=websocket_url,
-                                      certificate=self.certificate_path)
+            response, ok = send_json_data(json_data=model_data,
+                                          endpoint_url=websocket_url,
+                                          certificate=self.certificate_path)
+
+            if not ok:
+                response_text = response
+                self.logger.add_error("Response error", value=response_text)
+                response = None
+
         except requests.exceptions.ConnectionError as e:
             warn(str(e))
             response = None
@@ -516,7 +531,6 @@ class RemoteJobDriver(QThread):
 
             success = response.get("success", False)
 
-
             if success:
                 results_data = response["results"]
 

{gridcal-5.3.21 → gridcal-5.3.23}/GridCal/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.3.21"
+__GridCal_VERSION__ = "5.3.23"
 
 url = 'https://github.com/SanPen/GridCal'
 

{gridcal-5.3.21 → gridcal-5.3.23}/PKG-INFO

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