VeraGrid 5.5.19__tar.gz → 5.6.1__tar.gz

{veragrid-5.5.19 → veragrid-5.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.5.19
+Version: 5.6.1
 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.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/Editors/line_editor.py

@@ -82,7 +82,7 @@ class LineEditor(QDialog):
         r_ohm = self.line.R * Zbase / length
         x_ohm = self.line.X * Zbase / length
         b_us = self.line.B * Ybase / length * 1e6
-        I_KA = np.round(self.line.rate / (Vf * 1.73205080757), 6)  # current in KA
+        I_KA = np.round(self.line.rate / (Vf * 1.73205080757), 6)  # current in kA
 
         # ------------------------------------------------------------------------------------------
 
@@ -136,7 +136,7 @@ class LineEditor(QDialog):
         self.l_spinner.setMaximum(9999999)
         self.l_spinner.setDecimals(6)
         self.l_spinner.setValue(length)
-        self.l_spinner.setSuffix(' Km')
+        self.l_spinner.setSuffix(' km')
 
         # Max current
         self.i_spinner = QDoubleSpinBox()
@@ -144,7 +144,7 @@ class LineEditor(QDialog):
         self.i_spinner.setMaximum(9999999)
         self.i_spinner.setDecimals(6)
         self.i_spinner.setValue(I_KA)
-        self.i_spinner.setSuffix(' KA')
+        self.i_spinner.setSuffix(' kA')
 
         # R
         self.r_spinner = QDoubleSpinBox()
@@ -152,7 +152,7 @@ class LineEditor(QDialog):
         self.r_spinner.setMaximum(9999999)
         self.r_spinner.setDecimals(6)
         self.r_spinner.setValue(r_ohm)
-        self.r_spinner.setSuffix(' Ω/Km')
+        self.r_spinner.setSuffix(' Ω/km')
 
         # X
         self.x_spinner = QDoubleSpinBox()
@@ -160,7 +160,7 @@ class LineEditor(QDialog):
         self.x_spinner.setMaximum(9999999)
         self.x_spinner.setDecimals(6)
         self.x_spinner.setValue(x_ohm)
-        self.x_spinner.setSuffix(' Ω/Km')
+        self.x_spinner.setSuffix(' Ω/km')
 
         # B
         self.b_spinner = QDoubleSpinBox()
@@ -204,7 +204,7 @@ class LineEditor(QDialog):
         self.layout.addWidget(QLabel("L: Line length"))
         self.layout.addWidget(self.l_spinner)
 
-        self.layout.addWidget(QLabel("Imax: Max. current @" + str(int(Vf)) + " [KV]"))
+        self.layout.addWidget(QLabel("Imax: Max. current @" + str(int(Vf)) + " [kV]"))
         self.layout.addWidget(self.i_spinner)
 
         self.layout.addWidget(QLabel("R: Resistance"))
@@ -258,7 +258,7 @@ class LineEditor(QDialog):
                         x_ohm=self.x_spinner.value(),  # ohm / km
                         c_nf=self.b_spinner.value() * 1e3 / wf,  # nF / km
                         length=length,  # km
-                        Imax=self.i_spinner.value(),  # KA
+                        Imax=self.i_spinner.value(),  # kA
                         freq=self.frequency,  # Hz
                         Sbase=self.Sbase,  # MVA
                         apply_to_profile=self.apply_to_profile.isChecked()

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/Editors/transformer3w_editor.py

@@ -50,7 +50,7 @@ class WindingWidget(QFrame):
         # add all to the GUI
         self.layout.addWidget(QLabel(f"Winding {self.i}"))
 
-        v_str = f"{bus_to.Vnom} KV" if bus_to is not None else 'Not connected'
+        v_str = f"{bus_to.Vnom} kV" if bus_to is not None else 'Not connected'
         self.layout.addWidget(QLabel(f"Bus voltage: {v_str}"))
 
         if i == 1:
@@ -65,7 +65,7 @@ class WindingWidget(QFrame):
         # spacer
         self.layout.addWidget(QLabel(""))
 
-        self.layout.addWidget(QLabel(f"V{i}: Nominal voltage [KV]"))
+        self.layout.addWidget(QLabel(f"V{i}: Nominal voltage [kV]"))
         self.layout.addWidget(self.vn_spinner)
 
         self.layout.addWidget(QLabel(f"Sn{i}: Nominal power [MVA]"))

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/Editors/transformer_editor.py

@@ -197,8 +197,8 @@ class TransformerEditor(QDialog):
         :return: TransformerType instance
         """
         eps = 1e-20
-        Vf = self.transformer_obj.bus_from.Vnom  # KV
-        Vt = self.transformer_obj.bus_to.Vnom  # KV
+        Vf = self.transformer_obj.bus_from.Vnom  # kV
+        Vt = self.transformer_obj.bus_to.Vnom  # kV
         Sn = self.sn_spinner.value() + eps  # MVA
         Pcu = self.pcu_spinner.value() + eps  # kW
         Pfe = self.pfe_spinner.value() + eps  # kW

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -184,7 +184,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
 
         :return:
         """
-        max_vl = 1.0  # 1 KV
+        max_vl = 1.0  # 1 kV
         for vl_graphics in self.voltage_level_graphics:
             max_vl = max(max_vl, vl_graphics.api_object.Vnom)
 
@@ -242,7 +242,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         """
         Set the Z-order based on the voltage level voltage
         """
-        max_vl = 1.0  # 1 KV
+        max_vl = 1.0  # 1 kV
         for vl_graphics in self.voltage_level_graphics:
             max_vl = max(max_vl, vl_graphics.api_object.Vnom)
 
@@ -730,7 +730,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
             max_value=100000.0,
             default_value=self.editor.diagram.default_bus_voltage,
             title="Add voltage level",
-            text="Voltage (KV)",
+            text="Voltage (kV)",
         )
 
         inpt.exec()

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/SchematicWidget/Branches/dc_line_graphics.py

@@ -63,7 +63,7 @@ class DcLineEditor(QDialog):
         # X = self.branch.X * Zbase
         # B = self.branch.B * Ybase
 
-        I = self.branch.rate / Vf  # current in KA
+        I = self.branch.rate / Vf  # current in kA
 
         # ------------------------------------------------------------------------------------------
 
@@ -135,22 +135,22 @@ class DcLineEditor(QDialog):
             self.layout.addWidget(self.load_template_btn)
             self.layout.addWidget(QLabel(""))
 
-        self.layout.addWidget(QLabel("L: Line length [Km]"))
+        self.layout.addWidget(QLabel("L: Line length [km]"))
         self.layout.addWidget(self.l_spinner)
 
-        self.layout.addWidget(QLabel("Imax: Max. current [KA] @" + str(int(Vf)) + " [KV]"))
+        self.layout.addWidget(QLabel("Imax: Max. current [kA] @" + str(int(Vf)) + " [kV]"))
         self.layout.addWidget(self.i_spinner)
 
-        self.layout.addWidget(QLabel("R: Resistance [Ohm/Km]"))
+        self.layout.addWidget(QLabel("R: Resistance [Ohm/km]"))
         self.layout.addWidget(self.r_spinner)
 
-        # self.layout.addWidget(QLabel("X: Inductance [Ohm/Km]"))
+        # self.layout.addWidget(QLabel("X: Inductance [Ohm/km]"))
         # self.layout.addWidget(self.x_spinner)
 
-        # self.layout.addWidget(QLabel("G: Conductance [S/Km]"))
+        # self.layout.addWidget(QLabel("G: Conductance [S/km]"))
         # self.layout.addWidget(self.g_spinner)
 
-        # self.layout.addWidget(QLabel("B: Susceptance [S/Km]"))
+        # self.layout.addWidget(QLabel("B: Susceptance [S/km]"))
         # self.layout.addWidget(self.b_spinner)
 
         self.layout.addWidget(self.accept_btn)
@@ -171,7 +171,7 @@ class DcLineEditor(QDialog):
         Vf = self.branch.bus_from.Vnom
         Vt = self.branch.bus_to.Vnom
 
-        Sn = np.round(I * Vf, 2)  # nominal power in MVA = KA * KV
+        Sn = np.round(I * Vf, 2)  # nominal power in MVA = kA * kV
 
         Zbase = self.Sbase / (Vf * Vf)
         Ybase = 1.0 / Zbase

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/SchematicWidget/Branches/line_graphics.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 
-from PySide6 import QtWidgets
 from PySide6.QtCore import Qt, QRectF
 from PySide6.QtGui import QPen, QBrush
 from PySide6.QtWidgets import QMenu, QGraphicsRectItem, QGraphicsSceneContextMenuEvent
@@ -15,8 +14,7 @@ from VeraGrid.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem,
 from VeraGrid.Gui.Diagrams.Editors.line_editor import LineEditor
 from VeraGrid.Gui.messages import yes_no_question, warning_msg
 from VeraGrid.Gui.Diagrams.SchematicWidget.Branches.line_graphics_template import LineGraphicTemplateItem
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_dialogue import RmsChoiceDialog
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
+from VeraGrid.Gui.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
 from VeraGridEngine.Devices.Branches.line import Line, SequenceLineType
 from VeraGridEngine.enumerations import DeviceType
 
@@ -227,21 +225,24 @@ class LineGraphicItem(LineGraphicTemplateItem):
             pass
 
     def edit_rms(self):
-        """
 
-        """
-        templates = [t.name for t in
-                     self.editor.circuit.sequence_line_types]  # TODO: find where to build and save the templates
+        # load templates
+        templates = self.editor.circuit.rms_models
+
+        # select line templates
+        templ_catalogue = dict()
+        templ_list = []
+        for templ in templates:
+            if templ.tpe == DeviceType.LineDevice:
+                templ_list.append(templ.name)
+                templ_catalogue[templ.name] = templ
+
+        # prompt RmsModelEditorGUI
+        rms_model_editor = RmsModelEditorGUI(api_object_model_host=self.api_object.rms_model, templates_list=templ_list,
+                                             templates_catalogue=templ_catalogue, api_object_name=self.api_object.name,
+                                             api_object=self.api_object, main_editor = True, parent=self.editor)
+        rms_model_editor.show()
 
-        choice_dialog = RmsChoiceDialog(templates, parent=self.editor)
-        if choice_dialog.exec() == QtWidgets.QDialog.DialogCode.Accepted:
-            if choice_dialog.choice == "template":
-                template_name = choice_dialog.selected_template
-                print(f"User chose template: {template_name}")
-                # TODO: missing finding the template object and apply it to self.api_object
-            elif choice_dialog.choice == "editor":
-                dlg = RmsModelEditorGUI(self.api_object.rms_model, parent=self.editor)
-                dlg.show()
 
     def add_to_catalogue(self):
         """
@@ -252,7 +253,7 @@ class LineGraphicItem(LineGraphicTemplateItem):
 
         if ok:
             # rate = I
-            rated_current = self.api_object.rate / (self.api_object.Vf * 1.73205080757)  # MVA = KA * KV * sqrt(3)
+            rated_current = self.api_object.rate / (self.api_object.Vf * 1.73205080757)  # MVA = kA * kV * sqrt(3)
 
             tpe = SequenceLineType(name='SequenceLine from ' + self.api_object.name,
                                    idtag=None,

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/SchematicWidget/Branches/transformer3w_graphics.py

@@ -197,9 +197,9 @@ class Transformer3WGraphicItem(GenericDiagramWidget, QGraphicsRectItem):
         :return:
         """
         if self.api_object is not None:
-            self.winding_circles[0].setToolTip("Winding 1: {0} KV".format(self.api_object.V1))
-            self.winding_circles[1].setToolTip("Winding 2: {0} KV".format(self.api_object.V2))
-            self.winding_circles[2].setToolTip("Winding 3: {0} KV".format(self.api_object.V3))
+            self.winding_circles[0].setToolTip("Winding 1: {0} kV".format(self.api_object.V1))
+            self.winding_circles[1].setToolTip("Winding 2: {0} kV".format(self.api_object.V2))
+            self.winding_circles[2].setToolTip("Winding 3: {0} kV".format(self.api_object.V3))
 
     def set_label(self, val: str):
         """

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/SchematicWidget/Fluid/fluid_node_graphics.py

@@ -58,7 +58,7 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
         # Enabled for short circuit
         self.sc_enabled = [False, False, False, False]
-        self.sc_type = FaultType.ph3
+        self.sc_type = FaultType.LLLG
         self.pen_width = 4
 
         # index
@@ -535,7 +535,7 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                 msg += f" [{tpe}]"
             msg += "<br>"
             msg += f"v={vm}&lt;{va}º pu<br>"
-            msg += f"V={vm_kv} KV<br>"
+            msg += f"V={vm_kv} kV<br>"
             if P is not None:
                 p = format_str.format(P)
                 q = format_str.format(Q)
@@ -589,7 +589,7 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                 msg += f" [{tpe}]"
             msg += "<br>"
             msg += f"v={vm}&lt;{va}º pu<br>"
-            msg += f"V={vm_kv} KV<br>"
+            msg += f"V={vm_kv} kV<br>"
             if P is not None:
                 p = format_str.format(P)
                 q = format_str.format(Q)

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/generator_graphics.py

@@ -4,9 +4,10 @@
 # SPDX-License-Identifier: MPL-2.0
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 import numpy as np
-from PySide6 import QtWidgets
+from PySide6 import QtWidgets, QtCore
 from PySide6.QtWidgets import QMenu
 from VeraGridEngine.Devices.Injections.generator import Generator
 from VeraGrid.Gui.Diagrams.generic_graphics import Circle
@@ -16,9 +17,8 @@ from VeraGrid.Gui.Diagrams.Editors.generator_editor import GeneratorQCurveEditor
 from VeraGrid.Gui.SolarPowerWizard.solar_power_wizzard import SolarPvWizard
 from VeraGrid.Gui.WindPowerWizard.wind_power_wizzard import WindFarmWizard
 from VeraGrid.Gui.gui_functions import add_menu_entry
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_dialogue import RmsChoiceDialog
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
-from VeraGridEngine.Utils.Symbolic.block import Var, DynamicVarType
+from VeraGrid.Gui.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
+from VeraGridEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from VeraGrid.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
@@ -129,29 +129,22 @@ class GeneratorGraphicItem(InjectionTemplateGraphicItem):
 
         :return:
         """
-        templates = [t.name for t in
-                     self.editor.circuit.sequence_line_types]  # TODO: find where to build and save the templates
-
-        choice_dialog = RmsChoiceDialog(templates, parent=self.editor)
-        if choice_dialog.exec() == QtWidgets.QDialog.Accepted:
-            if choice_dialog.choice == "template":
-                template_name = choice_dialog.selected_template
-                print(f"User chose template: {template_name}")
-                # TODO: missing finding the template object and apply it to self.api_object
-            elif choice_dialog.choice == "editor":
-
-                self.api_object.rms_model.model.external_mapping = {
-                    DynamicVarType.P: self.api_object.P_g,
-                    DynamicVarType.Q: self.api_object.Q_g
-                }
-                if self.api_object.P_g not in self.api_object.rms_model.model.algebraic_vars and self.api_object.Q_g not in self.api_object.rms_model.model.algebraic_vars:
-                    self.api_object.rms_model.model.algebraic_vars.append(self.api_object.P_g)
-                    self.api_object.rms_model.model.algebraic_vars.append(self.api_object.Q_g)
-
-                # if self.api_object.Q_g not in self.api_object.rms_model.model.algebraic_vars:
-                #     self.api_object.rms_model.model.algebraic_vars.append(self.api_object.Q_g)
-                dlg = RmsModelEditorGUI(self.api_object.rms_model, parent=self.editor)
-                dlg.show()
+        # load templates
+        templates = self.editor.circuit.rms_models
+
+        # select line templates
+        templ_catalogue = dict()
+        templ_list = []
+        for templ in templates:
+            if templ.tpe == DeviceType.GeneratorDevice:
+                templ_list.append(templ.name)
+                templ_catalogue[templ.name] = templ
+
+        # prompt RmsModelEditorGUI
+
+        rms_model_editor = RmsModelEditorGUI(api_object_model_host=self.api_object.rms_model, templates_list=templ_list,
+                                             templates_catalogue=templ_catalogue, api_object_name= self.api_object.name, api_object= self.api_object, main_editor= True, parent=self.editor)
+        rms_model_editor.show()
 
     def to_battery(self):
         """

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/load_graphics.py

@@ -8,15 +8,13 @@ from typing import TYPE_CHECKING
 
 from PySide6 import QtWidgets
 from PySide6.QtCore import QPointF
-from PySide6.QtGui import QPen, QIcon, QPixmap, QPolygonF
-from PySide6.QtWidgets import QMenu
+from PySide6.QtGui import QPolygonF
 from VeraGrid.Gui.gui_functions import add_menu_entry
-from VeraGrid.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Polygon, Square
+from VeraGrid.Gui.Diagrams.generic_graphics import Polygon
 from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_dialogue import RmsChoiceDialog
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
-from VeraGrid.Gui.messages import yes_no_question
+from VeraGrid.Gui.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
 from VeraGridEngine.Devices.Injections.load import Load
+from VeraGridEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from VeraGrid.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
@@ -76,15 +74,19 @@ class LoadGraphicItem(InjectionTemplateGraphicItem):
 
         :return:
         """
-        templates = [t.name for t in
-                     self.editor.circuit.sequence_line_types]  # TODO: find where to build and save the templates
-
-        choice_dialog = RmsChoiceDialog(templates, parent=self.editor)
-        if choice_dialog.exec() == QtWidgets.QDialog.DialogCode.Accepted:
-            if choice_dialog.choice == "template":
-                template_name = choice_dialog.selected_template
-                print(f"User chose template: {template_name}")
-                # TODO: missing finding the template object and apply it to self.api_object
-            elif choice_dialog.choice == "editor":
-                dlg = RmsModelEditorGUI(self.api_object.rms_model, parent=self.editor)
-                dlg.show()
+        # load templates
+        templates = self.editor.circuit.rms_models
+
+        # select line templates
+        templ_catalogue = dict()
+        templ_list = []
+        for templ in templates:
+            if templ.tpe == DeviceType.LoadDevice:
+                templ_list.append(templ.name)
+                templ_catalogue[templ.name] = templ
+
+        # prompt RmsModelEditorGUI
+        rms_model_editor = RmsModelEditorGUI(api_object_model_host=self.api_object.rms_model, templates_list=templ_list,
+                                             templates_catalogue=templ_catalogue, api_object_name=self.api_object.name,
+                                             api_object=self.api_object, main_editor= True, parent=self.editor)
+        rms_model_editor.show()

{veragrid-5.5.19 → veragrid-5.6.1}/VeraGrid/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -13,7 +13,8 @@ from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent, QGraphicsItem
 
 from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from VeraGrid.Gui.messages import yes_no_question, warning_msg
-from VeraGrid.Gui.gui_functions import add_menu_entry, add_sub_menu
+from VeraGrid.Gui.gui_functions import add_menu_entry
+from VeraGrid.Gui.general_dialogues import ShortCircuitSelector
 from VeraGrid.Gui.Diagrams.generic_graphics import (GenericDiagramWidget, ACTIVE, DEACTIVATED,
                                                     FONT_SCALE, EMERGENCY, TRANSPARENT)
 from VeraGrid.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, HandleItem, RoundTerminalItem
@@ -31,12 +32,10 @@ from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.current_injection_graphics
 from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.controllable_shunt_graphics import (
     ControllableShuntGraphicItem,
     ControllableShunt)
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_dialogue import RmsChoiceDialog
-from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
-
-from VeraGridEngine.enumerations import DeviceType, FaultType, BusGraphicType
+from VeraGridEngine.enumerations import DeviceType, FaultType, BusGraphicType, MethodShortCircuit, PhasesShortCircuit
 from VeraGridEngine.Devices.types import INJECTION_DEVICE_TYPES
 from VeraGridEngine.Devices.Substation import Bus
+from VeraGridEngine.Devices.Aggregation.short_cirtcuit_event import ShortCircuitEvent
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from VeraGrid.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
@@ -188,8 +187,6 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             self.sizer.setFlag(self.GraphicsItemFlag.ItemIsMovable)
 
         # Enabled for short circuit
-        self.sc_enabled = np.zeros(4, dtype=bool)
-        self.sc_type = FaultType.ph3
         self.pen_width = 4
 
         self._terminal.setPen(QPen(TRANSPARENT, self.pen_width, self.style,
@@ -503,51 +500,9 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                        checked_value=self.draw_labels)
 
         add_menu_entry(menu=menu,
-                       text="Rms Editor",
-                       function_ptr=self.edit_rms,
-                       icon_path=":/Icons/icons/edit.png")
-
-        sc = add_sub_menu(menu=menu,
-                          text="Short circuit",
-                          icon_path=":/Icons/icons/short_circuit.png")
-
-        add_menu_entry(menu=sc,
-                       text="3-phase (x)" if self.sc_enabled[0] else "3-phase",
-                       icon_path=":/Icons/icons/short_circuit.png",
-                       function_ptr=self.enable_disable_sc_3p,
-                       checkeable=True,
-                       checked_value=self.sc_enabled[0])
-
-        add_menu_entry(menu=sc,
-                       text="Line-Ground (x)" if self.sc_enabled[1] else "Line-Ground",
-                       icon_path=":/Icons/icons/short_circuit.png",
-                       function_ptr=self.enable_disable_sc_lg,
-                       checkeable=True,
-                       checked_value=self.sc_enabled[1])
-
-        add_menu_entry(menu=sc,
-                       text="Line-Line (x)" if self.sc_enabled[2] else "Line-Line",
-                       icon_path=":/Icons/icons/short_circuit.png",
-                       function_ptr=self.enable_disable_sc_ll,
-                       checkeable=True,
-                       checked_value=self.sc_enabled[2])
-
-        add_menu_entry(menu=sc,
-                       text="Line-Line-Ground (x)" if self.sc_enabled[3] else "Line-Line-Ground",
-                       icon_path=":/Icons/icons/short_circuit.png",
-                       function_ptr=self.enable_disable_sc_llg,
-                       checkeable=True,
-                       checked_value=self.sc_enabled[3])
-
-        add_menu_entry(menu=sc,
-                       text="Disable",
-                       function_ptr=self.disable_sc)
-
-        # types
-        # ph3 = '3x'
-        # LG = 'LG'
-        # LL = 'LL'
-        # LLG = 'LLG'
+                       text="add Short circuit",
+                       icon_path=":/Icons/icons/short_circuit_plus.png",
+                       function_ptr=self.add_short_circuit)
 
         add_menu_entry(menu=menu,
                        text="Is a DC bus",
@@ -640,20 +595,6 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
         menu.exec_(event.screenPos())
 
-    def edit_rms(self):
-        templates = [t.name for t in
-                     self.editor.circuit.sequence_line_types]  # TODO: find where to build and save the templates
-
-        choice_dialog = RmsChoiceDialog(templates, parent=self.editor)
-        if choice_dialog.exec() == QtWidgets.QDialog.Accepted:
-            if choice_dialog.choice == "template":
-                template_name = choice_dialog.selected_template
-                print(f"User chose template: {template_name}")
-                # TODO: missing finding the template object and apply it to self.api_object
-            elif choice_dialog.choice == "editor":
-                dlg = RmsModelEditorGUI(self.api_object.rms_model, parent=self.editor)
-                dlg.show()
-
     def assign_status_to_profile(self):
         """
         Assign the snapshot rate to the profile
@@ -747,61 +688,23 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                         if host.api_object is not None:
                             self._editor.set_active_status_to_profile(host.api_object, override_question=True)
 
-    def any_short_circuit(self) -> bool:
-        """
-        Determine if there are short circuits enabled
-        :return:
-        """
-        return np.sum(self.sc_enabled) > 0
-
-    def enable_sc(self) -> None:
-        """
-        Enable the short circuit
-        """
-        self.tile.setPen(QPen(QColor(EMERGENCY['color']), self.pen_width))
-
-    def disable_sc(self):
-        """
-        Disable short circuit
-        """
-        self.tile.setPen(QPen(TRANSPARENT, self.pen_width))
-        self.sc_enabled[:] = 0  # set all to zero
-
-    def enable_disable_sc_3p(self):
+    def add_short_circuit(self) -> None:
         """
         Enable 3-phase short circuit
         """
-        self.sc_enabled[:] = 0  # set all to zero
-        self.sc_enabled[0] = True
-        self.sc_type = FaultType.ph3
-        self.enable_sc()
-
-    def enable_disable_sc_lg(self):
-        """
-        Enable line ground short circuit
-        """
-        self.sc_enabled[:] = 0  # set all to zero
-        self.sc_enabled[1] = True
-        self.sc_type = FaultType.LG
-        self.enable_sc()
-
-    def enable_disable_sc_ll(self):
-        """
-        Enable line-line short circuit
-        """
-        self.sc_enabled[:] = 0  # set all to zero
-        self.sc_enabled[2] = True
-        self.sc_type = FaultType.LL
-        self.enable_sc()
-
-    def enable_disable_sc_llg(self):
-        """
-        Enable line-line-ground short circuit
-        """
-        self.sc_enabled[:] = 0  # set all to zero
-        self.sc_enabled[3] = True
-        self.sc_type = FaultType.LLG
-        self.enable_sc()
+        self.w = ShortCircuitSelector()
+        self.w.exec()
+        
+        if self.w.was_accepted:
+            sc = ShortCircuitEvent(
+                name=f"{self.api_object.name} {self.w.fault.value}",
+                device=self.api_object,
+                fault_type=self.w.fault,
+                method=self.w.method,
+                phases=self.w.phases
+            )
+    
+            self.editor.circuit.add_short_circuit_definition(sc)
 
     def enable_disable_dc(self):
         """
@@ -1035,7 +938,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             vm = format_str.format(Vm)
             vm_kv = format_str.format(Vm * self._api_object.Vnom)
             va = format_str.format(Va)
-            msg += f"V={vm_kv} KV<br>  {vm}&lt;{va}º p.u.<br>"
+            msg += f"V={vm_kv} kV<br>  {vm}&lt;{va}º p.u.<br>"
 
             if P is not None:
                 p = format_str.format(P)
@@ -1087,7 +990,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                     vm = format_str.format(Vm_i)
                     vm_kv = format_str.format(Vm_i * self._api_object.Vnom)
                     va = format_str.format(Va_i)
-                    msg += f"V{ph}={vm_kv} KV / {vm}&lt;{va}º p.u.<br>"
+                    msg += f"V{ph}={vm_kv} kV / {vm}&lt;{va}º p.u.<br>"
 
             for P_i, Q_i, ph in zip([PA, PB, PC], [QA, QB, QC], ["a", "b", "c"]):
                 if not (P_i == 0.0 and Q_i == 0.0):