devel_con_filter

README.md

@@ -799,7 +799,7 @@ branches = main_circuit.get_branches()
 # manually generate the contingencies
 for i, br in enumerate(branches):
     # add a contingency group
-    group = ContingencyGroup(name="contingency {}".format(i+1))
+    group = ContingencyGroup(name="contingency {}".format(i + 1))
     main_circuit.add_contingency_group(group)
 
     # add the branch contingency to the groups, only groups are failed at once
@@ -809,17 +809,17 @@ for i, br in enumerate(branches):
 # add a special contingency
 group = ContingencyGroup(name="Special contingency")
 main_circuit.add_contingency_group(group)
-main_circuit.add_contingency(Contingency(device_idtag=branches[3].idtag, 
+main_circuit.add_contingency(Contingency(device_idtag=branches[3].idtag,
                                          name=branches[3].name, group=group))
-main_circuit.add_contingency(Contingency(device_idtag=branches[5].idtag, 
+main_circuit.add_contingency(Contingency(device_idtag=branches[5].idtag,
                                          name=branches[5].name, group=group))
 
 pf_options = PowerFlowOptions(solver_type=SolverType.NR)
 
 # declare the contingency options
 options_ = ContingencyAnalysisOptions(use_provided_flows=False,
                                       Pf=None,
-                                      engine=ContingencyMethod.PowerFlow,
+                                      contingency_method=ContingencyMethod.PowerFlow,
                                       # if no power flow options are provided 
                                       # a linear power flow is used
                                       pf_options=pf_options)

doc/rst_source/theory/simulations.rst

@@ -31,6 +31,7 @@ Optimal power flow
     opf/opf
     opf/opf_dc_ts
     opf/opf_ac_ts
+    opf/acopf
     opf/hydro
 
 

examples/contingency_analysis_run.py

@@ -30,14 +30,13 @@
 # declare the contingency options
 options_ = ContingencyAnalysisOptions(use_provided_flows=False,
                                       Pf=None,
-                                      engine=en.ContingencyMethod.PowerFlow,
+                                      contingency_method=en.ContingencyMethod.PowerFlow,
                                       pf_options=pf_options)
 
-linear_multiple_contingencies = LinearMultiContingencies(grid=main_circuit)
-
 simulation = ContingencyAnalysisDriver(grid=main_circuit,
                                        options=options_,
-                                       linear_multiple_contingencies=linear_multiple_contingencies)
+                                       linear_multiple_contingencies=None  # it is computed inside
+                                       )
 
 simulation.run()
 

examples/contingency_analysis_ts.py

@@ -19,7 +19,7 @@
 options_ = ContingencyAnalysisOptions(
     use_provided_flows=False,
     Pf=None,
-    engine=en.ContingencyMethod.PTDF,
+    contingency_method=en.ContingencyMethod.PTDF,
     pf_options=PowerFlowOptions(),
 )
 

src/GridCal/Gui/Diagrams/MapWidget/Schema/map_template_line.py

@@ -123,6 +123,15 @@ def update_connectors(self) -> None:
         for conector in self.segments_list:
             conector.update_endings()
 
+    def end_update(self) -> None:
+        """
+
+        :return:
+        """
+
+        for conector in self.segments_list:
+            conector.end_update()
+
     def draw_all(self) -> None:
         """
 
@@ -198,8 +207,7 @@ def redraw_segments(self) -> None:
             # Assuming Connector takes (scene, node1, node2) as arguments
             segment_graphic_object = Segment(first=elm1, second=elm2)
 
-            elm1.needsUpdateFirst = True
-            elm2.needsUpdateSecond = True
+            elm2.needsUpdate = True
             segment_graphic_object.needsUpdate = True
 
             # register the segment in the line

src/GridCal/Gui/Diagrams/MapWidget/Schema/node_graphic_item.py

@@ -115,8 +115,7 @@ def updatePosition(self):
 
         if self.enabled:
             self.updateRealPos()
-            self.needsUpdateFirst = True
-            self.needsUpdateSecond = True
+            self.needsUpdate = True
             self.line_container.update_connectors()
 
     def updateDiagram(self):

src/GridCal/Gui/Diagrams/MapWidget/Schema/node_template.py

@@ -35,14 +35,12 @@ class NodeTemplate:
     """
 
     def __init__(self,
-                 needsUpdateFirst: bool = True,
-                 needsUpdateSecond: bool = True,
+                 needsUpdate: bool = True,
                  lat: float = 0.0,
                  lon: float = 0.0):
         """
         """
-        self.needsUpdateFirst: bool = needsUpdateFirst
-        self.needsUpdateSecond: bool = needsUpdateSecond
+        self.needsUpdate: bool = needsUpdate
         self.lat = lat
         self.lon = lon
 

src/GridCal/Gui/Diagrams/MapWidget/Schema/segment.py

@@ -60,12 +60,13 @@ def update_endings(self) -> None:
         """
 
         # Get the positions of the first and second objects
-        if self.first.needsUpdateFirst or self.second.needsUpdateSecond:
+        if self.first.needsUpdate or self.second.needsUpdate:
             first_pos = self.first.getRealPos()
             second_pos = self.second.getRealPos()
 
             # Set the line's starting and ending points
             self.setLine(first_pos[0], first_pos[1], second_pos[0], second_pos[1])
 
-            self.first.needsUpdateFirst = False
-            self.second.needsUpdateSecond = False
+    def end_update(self) -> None:
+        self.first.needsUpdate = False
+        self.second.needsUpdate = False

src/GridCal/Gui/Diagrams/MapWidget/Schema/substation_graphic_item.py

@@ -116,8 +116,6 @@ def updatePosition(self):
         self.x = center_point.x() + real_position.x()
         self.y = center_point.y() + real_position.y()
         self.needsUpdate = True
-        self.updateDiagram()
-
     def updateDiagram(self):
         """
 

src/GridCal/Gui/Diagrams/MapWidget/Schema/voltage_level_graphic_item.py

@@ -100,7 +100,6 @@ def updatePosition(self):
         self.x = center_point.x() + real_position.x()
         self.y = center_point.y() + real_position.y()
         self.needsUpdate = True
-        self.updateDiagram()
 
     def updateDiagram(self):
         """

src/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -14,14 +14,16 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+import os
 from typing import Union, List, Tuple
 import cv2
 import numpy as np
 from PySide6.QtWidgets import QWidget, QGraphicsItem
-from PySide6.QtCore import Qt
+from PySide6.QtCore import Qt, QSize, QRect
 from PySide6.QtGui import QColor
 from collections.abc import Callable
 from PySide6.QtGui import (QImage, QPainter)
+from PySide6.QtSvg import QSvgGenerator
 
 from GridCalEngine.Devices.Diagrams.map_location import MapLocation
 from GridCalEngine.Devices.Substation import Bus
@@ -355,7 +357,6 @@ def merge_lines(self):
         better_first.line_container.disable_line()
         better_second.line_container.disable_line()
 
-
     def create_line(self, api_object: BRANCH_TYPES, original: bool = True) -> MapTemplateLine:
         """
         Adds a line with the nodes and segments
@@ -389,6 +390,9 @@ def update_connectors(self):
             for idtag, graphic_object in dev_dict.items():
                 graphic_object.update_connectors()
 
+            for idtag, graphic_object in dev_dict.items():
+                graphic_object.end_update()
+
     def create_substation(self,
                           api_object: Substation,
                           lat: float, lon: float,
@@ -668,7 +672,8 @@ def colour_results(self,
                     color = QColor(r, g, b, a)
                     style = Qt.SolidLine
                     if use_flow_based_width:
-                        weight = int(np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
+                        weight = int(
+                            np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
                     else:
                         weight = 0.5
 
@@ -718,27 +723,58 @@ def colour_results(self,
                     color = QColor(r, g, b, a)
                     style = Qt.SolidLine
                     if use_flow_based_width:
-                        weight = int(np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
+                        weight = int(
+                            np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
                     else:
                         weight = 0.5
 
                     graphic_object.set_colour(color=color, w=weight, style=style, tool_tip=tooltip)
 
-    def get_image(self, w: int, h: int) -> QImage:
+    def get_image(self) -> Tuple[QImage, int, int]:
+        """
+        get the current picture
+        :return: QImage, width, height
         """
+        w = self.width()
+        h = self.height()
 
-        :param w:
-        :param h:
-        :return:
+        # image = QImage(w, h, QImage.Format_RGB32)
+        # image.fill(Qt.white)
+        #
+        # painter = QPainter(image)
+        # painter.setRenderHint(QPainter.Antialiasing)
+        # # self.view.render(painter)  # self.view stores the grid widgets
+        # self.render(painter)
+        # painter.end()
+        image = self.grab().toImage()
+
+        return image, w, h
+
+    def take_picture(self, filename: str):
         """
-        image = QImage(w, h, QImage.Format_ARGB32_Premultiplied)
-        image.fill(Qt.transparent)
-        painter = QPainter(image)
-        painter.setRenderHint(QPainter.Antialiasing)
-        self.diagram_scene.render(painter)
-        painter.end()
+        Save the grid to a png file
+        """
+        name, extension = os.path.splitext(filename.lower())
+
+        if extension == '.png':
+            image, _, _ = self.get_image(transparent=True)
+            image.save(filename)
 
-        return image
+        elif extension == '.svg':
+            w = self.width()
+            h = self.height()
+            svg_gen = QSvgGenerator()
+            svg_gen.setFileName(filename)
+            svg_gen.setSize(QSize(w, h))
+            svg_gen.setViewBox(QRect(0, 0, w, h))
+            svg_gen.setTitle("Electrical grid schematic")
+            svg_gen.setDescription("An SVG drawing created by GridCal")
+
+            painter = QPainter(svg_gen)
+            self.render(painter)
+            painter.end()
+        else:
+            raise Exception('Extension ' + str(extension) + ' not supported :(')
 
     def start_video_recording(self, fname: str, fps: int = 30) -> Tuple[int, int]:
         """
@@ -758,17 +794,16 @@ def start_video_recording(self, fname: str, fps: int = 30) -> Tuple[int, int]:
 
         return w, h
 
-    def capture_video_frame(self, w: int, h: int):
+    def capture_video_frame(self):
         """
         Save video frame
         """
 
-        qimage = self.get_image(w=w, h=h)
-
-        ptr = qimage.convertToFormat(QImage.Format.Format_RGB32).constBits()
-
-        frame = np.array(ptr).reshape(h, w, 4)  # Copies the data
+        image, w, h = self.get_image()
 
+        # convert picture using the memory
+        # we need to remove the alpha channel, otherwise the video frame is not saved
+        frame = np.array(image.constBits()).reshape(h, w, 4).astype(np.uint8)[:, :, :3]
         self._video.write(frame)
 
     def end_video_recording(self):

src/GridCal/Gui/Diagrams/SchematicWidget/generic_graphics.py

@@ -35,6 +35,7 @@
 ACTIVE = {'style': Qt.SolidLine,
           'color': Qt.white if IS_DARK else Qt.black,
           'text': Qt.white if IS_DARK else Qt.black,
+          'backgound': Qt.black if IS_DARK else Qt.white,
           'fluid': QColor(0, 170, 212, 255)}
 
 DEACTIVATED = {'style': Qt.DashLine, 'color': Qt.gray}
@@ -61,6 +62,10 @@ def set_light_mode() -> None:
     ACTIVE['text'] = Qt.black
 
 
+def is_dark_mode() -> bool:
+    return IS_DARK
+
+
 if IS_DARK:
     set_dark_mode()
 else:
@@ -171,6 +176,7 @@ class GenericDBWidget:
     """
     Generic DataBase Widget
     """
+
     def __init__(self,
                  parent,
                  api_object: ALL_DEV_TYPES,
@@ -254,5 +260,3 @@ def enable_disable_label_drawing(self):
         :return:
         """
         self.draw_labels = not self.draw_labels
-
-