Merge branch 'devel'

# Conflicts: # src/GridCal/Gui/Main/icons_rc.py
SanPen · Apr 8, 2024 · 6e8e389 · 6e8e389
2 parents 09e29aa + a895a02
commit 6e8e389
Show file tree

Hide file tree

Showing 142 changed files with 37,459 additions and 30,539 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Grids_and_profiles/grids/GB reduced network.gridcal b/Grids_and_profiles/grids/GB reduced network.gridcal
diff --git a/Grids_and_profiles/grids/Texas 2000 + VSC.gridcal b/Grids_and_profiles/grids/Texas 2000 + VSC.gridcal
diff --git a/doc/auto_document_models.py b/doc/auto_document_models.py
@@ -1,7 +1,7 @@
 import os
 from typing import Dict
 import pandas as pd
-# from pytablewriter import RstSimpleTableWriter
+from pytablewriter import RstSimpleTableWriter
 from GridCalEngine.IO.cim.cgmes.cgmes_circuit import CgmesCircuit
 from GridCalEngine.IO.raw.devices.psse_circuit import PsseCircuit
 from GridCalEngine.Devices.multi_circuit import MultiCircuit

diff --git a/doc/rst_source/other_data_models.rst b/doc/rst_source/other_data_models.rst
diff --git a/pics/GridCal.png b/pics/GridCal.png
diff --git a/pics/GridCal4_icon.png b/pics/GridCal4_icon.png
diff --git a/pics/GridCal5_icon.svg b/pics/GridCal5_icon.svg
diff --git a/pics/GridCal_banner1.png b/pics/GridCal_banner1.png
diff --git a/pics/GridCal_black.png b/pics/GridCal_black.png
diff --git a/pics/GridCal_icon.png b/pics/GridCal_icon.png
diff --git a/...usBranchEditorWidget/Branches/__init__.py → .../DiagramEditorWidget/Branches/__init__.py b/...usBranchEditorWidget/Branches/__init__.py → .../DiagramEditorWidget/Branches/__init__.py
diff --git a/...EditorWidget/Branches/dc_line_graphics.py → ...EditorWidget/Branches/dc_line_graphics.py b/...EditorWidget/Branches/dc_line_graphics.py → ...EditorWidget/Branches/dc_line_graphics.py
@@ -15,20 +15,20 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 import numpy as np
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu, QLabel, QDoubleSpinBox, QPushButton, QVBoxLayout, QComboBox, QDialog, QGraphicsScene
-from GridCal.Gui.GuiFunctions import get_list_model
-from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
+from GridCal.Gui.GuiFunctions import get_list_model, add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCalEngine.Devices.Branches.line import SequenceLineType, OverheadLineType, UndergroundLineType
 from GridCalEngine.Devices.Branches.dc_line import DcLine
 from GridCalEngine.enumerations import DeviceType
-from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class DcLineEditor(QDialog):
@@ -230,9 +230,9 @@ def load_template_btn_click(self):
 class DcLineGraphicItem(LineGraphicTemplateItem):
 
     def __init__(self,
-                 from_port: TerminalItem,
-                 to_port: TerminalItem,
-                 editor: BusBranchEditorWidget,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem],
+                 editor: DiagramEditorWidget,
                  width=5, api_object: DcLine = None):
         """
 
@@ -264,6 +264,13 @@ def contextMenuEvent(self, event):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           icon_path="",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             ra3 = menu.addAction('Editor')
             edit_icon = QIcon()
             edit_icon.addPixmap(QPixmap(":/Icons/icons/edit.svg"))

diff --git a/...nchEditorWidget/Branches/hvdc_graphics.py → ...ramEditorWidget/Branches/hvdc_graphics.py b/...nchEditorWidget/Branches/hvdc_graphics.py → ...ramEditorWidget/Branches/hvdc_graphics.py
@@ -15,23 +15,24 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
+from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine
-from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class HvdcGraphicItem(LineGraphicTemplateItem):
 
     def __init__(self,
-                 from_port: TerminalItem,
-                 to_port: TerminalItem,
-                 editor: BusBranchEditorWidget,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem],
+                 editor: DiagramEditorWidget,
                  width=5,
                  api_object: HvdcLine = None):
         """
@@ -64,6 +65,13 @@ def contextMenuEvent(self, event):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           icon_path="",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             # pe2 = menu.addAction('Convert to Multi-terminal')
             # pe2.triggered.connect(self.convert_to_multi_terminal)
 

diff --git a/...ranchEditorWidget/Branches/line_editor.py → ...agramEditorWidget/Branches/line_editor.py b/...ranchEditorWidget/Branches/line_editor.py → ...agramEditorWidget/Branches/line_editor.py
diff --git a/...nchEditorWidget/Branches/line_graphics.py → ...ramEditorWidget/Branches/line_graphics.py b/...nchEditorWidget/Branches/line_graphics.py → ...ramEditorWidget/Branches/line_graphics.py
@@ -19,15 +19,16 @@
 from PySide6.QtCore import Qt, QRectF
 from PySide6.QtGui import QPen, QIcon, QPixmap, QBrush
 from PySide6.QtWidgets import QMenu, QGraphicsRectItem, QGraphicsSceneContextMenuEvent
-from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
-from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_editor import LineEditor
+from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.line_editor import LineEditor
 from GridCal.Gui.messages import yes_no_question, warning_msg
-from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Branches.line import Line, SequenceLineType
 from GridCalEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class LineGraphicItem(LineGraphicTemplateItem):
@@ -36,9 +37,9 @@ class LineGraphicItem(LineGraphicTemplateItem):
     """
 
     def __init__(self,
-                 from_port: TerminalItem,
-                 to_port: Union[TerminalItem, None],
-                 editor: BusBranchEditorWidget,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem, None],
+                 editor: DiagramEditorWidget,
                  width=5,
                  api_object: Line = None):
         """
@@ -123,6 +124,12 @@ def contextMenuEvent(self, event: QGraphicsSceneContextMenuEvent):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             ra3 = menu.addAction('Editor')
             edit_icon = QIcon()
             edit_icon.addPixmap(QPixmap(":/Icons/icons/edit.svg"))