GridCal 5.1.20__tar.gz → 5.1.21__tar.gz

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -15,6 +15,8 @@
 # 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
+
+# import uuid
 from typing import TYPE_CHECKING, List, Union
 
 import logging
@@ -28,6 +30,7 @@ from GridCalEngine.Devices.types import BRANCH_TYPES, FluidPath
 from GridCalEngine.Devices.Branches.line import Line
 from GridCalEngine.enumerations import DeviceType
 from GridCal.Gui.Diagrams.generic_graphics import GenericDiagramWidget
+from GridCal.Gui.messages import error_msg
 
 if TYPE_CHECKING:
     from GridCal.Gui.Diagrams.MapWidget.Substation.node_graphic_item import NodeGraphicItem
@@ -158,39 +161,15 @@ class MapLineContainer(GenericDiagramWidget):
         """
         self.clean()
 
-        diagram_locations: PointsGroup = self.editor.diagram.data.get(DeviceType.LineLocation.value, None)
-
         # draw line locations
         for elm in self.api_object.locations.data:
+            graphic_obj = self.editor.create_node(line_container=self,
+                                                  api_object=elm,
+                                                  lat=elm.lat,  # 42.0 ...
+                                                  lon=elm.long,
+                                                  index=self.number_of_nodes())  # 2.7 ...
 
-            if diagram_locations is None:
-                # no locations found, use the data from the api object
-                # lat = elm.lat
-                # lon = elm.long
-                pass
-            else:
-
-                # try to get location from the diagram
-                # We will not take the location of the element in the database because we want to keep...
-                # ... the diagram separated from database
-                # diagram_location = diagram_locations.locations.get(elm.idtag, None)
-
-                # if diagram_location is None:
-                #     # no particular location found, use the data from the api object
-                #     # lat = elm.lat
-                #     # lon = elm.long
-                #     pass
-                # else:
-                #     # Draw only what's on the diagram
-                #     # diagram data found, use it
-
-                graphic_obj = self.editor.create_node(line_container=self,
-                                                      api_object=elm,
-                                                      lat=elm.lat,  # 42.0 ...
-                                                      lon=elm.long,
-                                                      index=self.number_of_nodes())  # 2.7 ...
-
-                self.register_new_node(node=graphic_obj)
+            self.register_new_node(node=graphic_obj)
 
         # second pass: create the segments
         self.redraw_segments()
@@ -206,6 +185,7 @@ class MapLineContainer(GenericDiagramWidget):
                 self.editor.map.diagram_scene.removeItem(seg)
 
         self.nodes_list.remove(node)
+        self.api_object.locations.remove(node.api_object)
 
         for nod in self.nodes_list:
             if nod.index > node.index:
@@ -291,7 +271,7 @@ class MapLineContainer(GenericDiagramWidget):
                                           z=new_api_node_data.alt,
                                           seq=new_api_node_data.seq,
                                           name=new_api_node_data.name,
-                                          idtag=new_api_node_data.idtag,
+                                          idtag=None,  # generates new UUID
                                           code=new_api_node_data.code)
 
             self.api_object.locations.data.insert(index, new_api_object)
@@ -434,11 +414,11 @@ class MapLineContainer(GenericDiagramWidget):
         if 0 < index < len(self.api_object.locations.data) and len(self.api_object.locations.data) > 3:
 
             ln1 = Line()
-            ln1.copyData(self.api_object)
+            ln1.set_data_from(self.api_object)
             # ln1 = self.api_object.copy()
 
             ln2 = Line()
-            ln2.copyData(self.api_object)
+            ln2.set_data_from(self.api_object)
 
             first_list = self.api_object.locations.data[:index]
             second_list = self.api_object.locations.data[index:]
@@ -457,6 +437,9 @@ class MapLineContainer(GenericDiagramWidget):
                 api_obj.long = self.nodes_list[idx].lon
                 idx = idx + 1
 
+            ln1.bus_from = self.api_object.bus_from
+            ln2.bus_to = self.api_object.bus_to
+
             l1 = self.editor.add_api_line(ln1, original=False)
             l2 = self.editor.add_api_line(ln2, original=False)
 
@@ -465,10 +448,7 @@ class MapLineContainer(GenericDiagramWidget):
             return first_list, second_list
         else:
             # Handle invalid index
-            raise ValueError("Index out of range or invalid")
-
-    def merge_line(self):
-        return 0
+            error_msg("Index out of range or invalid", "split line")
 
     def disable_line(self):
         """

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -335,7 +335,10 @@ class MapLineSegment(QGraphicsLineItem):
             elif self.second == self.container.substation_from() or self.first == self.container.substation_from():
                 self.container.insert_new_node_at_position(0)
             else:
-                self.container.insert_new_node_at_position(self.first.index)
+                if self.first.index > self.second.index:
+                    self.container.insert_new_node_at_position(self.second.index)
+                elif self.first.index < self.second.index:
+                    self.container.insert_new_node_at_position(self.second.index)
 
         # TODO implement
         # self.editor.split_line(line_graphics=self)

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/Substation/node_graphic_item.py

@@ -79,7 +79,7 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         # self.api_object: LineLocation = api_object
         self.index = index
 
-        self.resize(r)
+        self.resize(r * 10)
         self.setAcceptHoverEvents(True)  # Enable hover events for the item
         self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable)  # Allow moving the node
         self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsSelectable)  # Allow selecting the node
@@ -88,7 +88,6 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
 
         self.hovered = False
         self.enabled = True
-        self.itemSelected = False
 
         # Create a pen with reduced line width
         self.change_pen_width(0.001)
@@ -173,13 +172,13 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         Event handler for mouse press events.
         """
         super().mousePressEvent(event)
-
+        selected_items = self.editor.map.view._scene.selectedItems()
+        if len(selected_items) < 2:
+            self.setSelected(True)
         if self.enabled:
             self.editor.map.view.disableMove = True
             if event.button() == Qt.RightButton:
                 pass
-            elif event.button() == Qt.LeftButton:
-                self.selectItem()
 
     def mouseReleaseEvent(self, event):
         """
@@ -190,11 +189,15 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         self.updateDiagram()
         self.editor.map.view._scene.update()
 
+        selected_items = self.editor.map.view._scene.selectedItems()
+        if len(selected_items) < 2:
+            self.setSelected(True)
+
     def hoverEnterEvent(self, event: QtWidgets.QGraphicsSceneHoverEvent) -> None:
         """
         Event handler for when the mouse enters the item.
         """
-        self.editor.inItem = True
+        self.editor.map.view.inItem = True
         self.hovered = True
         self.setNodeColor(QColor(Qt.red), QColor(Qt.red))
         QApplication.instance().setOverrideCursor(Qt.PointingHandCursor)
@@ -203,7 +206,7 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         """
         Event handler for when the mouse leaves the item.
         """
-        self.editor.inItem = False
+        self.editor.map.view.inItem = False
         self.hovered = False
         self.setDefaultColor()
         QApplication.instance().restoreOverrideCursor()
@@ -217,45 +220,22 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         menu = QMenu()
 
         add_menu_entry(menu=menu,
-                       text="Add",
+                       text="Merge",
                        icon_path="",
-                       function_ptr=self.AddFunction)
+                       function_ptr=self.MergeFunction)
 
         add_menu_entry(menu=menu,
                        text="Split",
-                       icon_path="",
+                       icon_path=":/Icons/icons/divide.svg",
                        function_ptr=self.SplitFunction)
 
         add_menu_entry(menu=menu,
-                       text="Merge",
-                       icon_path="",
-                       function_ptr=self.MergeFunction)
-
-        add_menu_entry(menu=menu,
-                       text="Remove",
-                       icon_path="",
+                       text="Delete",
+                       icon_path=":/Icons/icons/delete.svg",
                        function_ptr=self.RemoveFunction)
 
         menu.exec_(event.screenPos())
 
-    def selectItem(self):
-        """
-
-        :return:
-        """
-        if not self.itemSelected:
-            self.editor.map.view.selectedItems.append(self)
-            self.setNodeColor(QColor(Qt.yellow), QColor(Qt.yellow))
-        self.itemSelected = True
-
-    def deSelectItem(self):
-        """
-
-        :return:
-        """
-        self.itemSelected = False
-        self.setDefaultColor()
-
     def AddFunction(self):
         """
 
@@ -312,10 +292,7 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         :return:
         """
         # Example: color assignment
-        if self.itemSelected:
-            self.setNodeColor(QColor(Qt.yellow), QColor(Qt.yellow))
-        else:
-            self.setNodeColor(self.colorInner, self.colorBorder)
+        self.setNodeColor(self.colorInner, self.colorBorder)
 
     def getPos(self) -> QPointF:
         """

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -25,6 +25,8 @@ from GridCal.Gui.Diagrams.MapWidget.Substation.node_template import NodeTemplate
 from GridCal.Gui.GuiFunctions import add_menu_entry
 from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.GeneralDialogues import InputNumberDialogue
+
+from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices import VoltageLevel
 from GridCalEngine.Devices.Substation.substation import Substation
 from GridCalEngine.enumerations import DeviceType
@@ -69,7 +71,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                               lon=lon)
 
         self.line_container = None
-        self.editor: GridMapWidget = editor  # re assign for the types to be clear
+        self.editor: GridMapWidget = editor  # reassign for the types to be clear
         self.api_object: Substation = api_object
 
         self.lat = lat
@@ -191,10 +193,13 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         Event handler for mouse press events.
         """
         super().mousePressEvent(event)
+        selected_items = self.editor.map.view._scene.selectedItems()
+        if len(selected_items) < 2:
+            self.setSelected(True)
+
         event.setAccepted(True)
         self.editor.map.view.disableMove = True
 
-        print("SE mouse press")
         if self.api_object is not None:
             self.editor.set_editor_model(api_object=self.api_object,
                                          dictionary_of_lists={
@@ -206,6 +211,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                                              DeviceType.ZoneDevice: self.editor.circuit.get_zones(),
                                          })
 
+
     def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent):
         """
         Event handler for mouse release events.
@@ -219,6 +225,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         Event handler for when the mouse enters the item.
         """
+        self.editor.map.view.inItem = True
         self.setNodeColor(QColor(Qt.red), QColor(Qt.red))
         self.hovered = True
         QApplication.instance().setOverrideCursor(Qt.PointingHandCursor)
@@ -227,6 +234,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         Event handler for when the mouse leaves the item.
         """
+        self.editor.map.view.inItem = False
         self.hovered = False
         self.setDefaultColor()
         QApplication.instance().restoreOverrideCursor()
@@ -243,6 +251,11 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                        icon_path="",
                        function_ptr=self.add_voltage_level)
 
+        add_menu_entry(menu=menu,
+                       text="Create line",
+                       icon_path="",
+                       function_ptr=self.create_new_line)
+
         add_menu_entry(menu=menu,
                        text="Move to API coordinates",
                        icon_path="",
@@ -263,8 +276,16 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                        icon_path="",
                        function_ptr=self.new_substation_diagram)
 
+
+
         menu.exec_(event.screenPos())
 
+    def create_new_line(self):
+        """
+        Create a new line in the map wizard
+        """
+        self.editor.createNewLineWizard()
+
     def add_function(self):
         """
 
@@ -281,9 +302,11 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
             for idtag, graphic_object in dev_dict.items():
                 substation_from_graphics = self.editor.graphics_manager.query(
-                    elm=graphic_object.api_object.get_substation_from())
+                    elm=graphic_object.api_object.get_substation_from()
+                )
                 substation_to_graphics = self.editor.graphics_manager.query(
-                    elm=graphic_object.api_object.get_substation_to())
+                    elm=graphic_object.api_object.get_substation_to()
+                )
                 lines_info.append((idtag, graphic_object, substation_from_graphics, substation_to_graphics))
 
             # Now, iterate over the collected information
@@ -333,7 +356,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         inpt = InputNumberDialogue(
             min_value=1.0,
             max_value=100000.0,
-            default_value=1.0,
+            default_value=self.editor.diagram.default_bus_voltage,
             title="Add voltage level",
             text="Voltage (kV)",
         )
@@ -346,7 +369,14 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                               Vnom=kv,
                               substation=self.api_object)
 
+            bus = Bus(name=f"Bus {self.api_object.name}",
+                      Vnom=kv,
+                      substation=self.api_object,
+                      voltage_level=vl)
+
             self.editor.circuit.add_voltage_level(vl)
+            self.editor.circuit.add_bus(obj=bus)
+
             self.editor.add_api_voltage_level(substation_graphics=self,
                                               api_object=vl)
 

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/Substation/voltage_level_graphic_item.py

@@ -19,10 +19,13 @@ from typing import TYPE_CHECKING
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor
-from PySide6.QtWidgets import QGraphicsSceneMouseEvent, QGraphicsEllipseItem
+from PySide6.QtWidgets import (QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsEllipseItem)
+
 from GridCal.Gui.Diagrams.generic_graphics import GenericDiagramWidget
+from GridCal.Gui.GuiFunctions import add_menu_entry
 
 from GridCalEngine.Devices.Substation.voltage_level import VoltageLevel
+from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
@@ -61,19 +64,21 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
                                       api_object=api_object,
                                       editor=editor,
                                       draw_labels=draw_labels)
-        QGraphicsEllipseItem.__init__(self, parent_center.x(), parent_center.y(), r * api_object.Vnom, r * api_object.Vnom, parent)
+        QGraphicsEllipseItem.__init__(self, parent_center.x(), parent_center.y(), r * api_object.Vnom * 0.01,
+                                      r * api_object.Vnom * 0.01, parent)
 
         parent.register_voltage_level(vl=self)
 
         self.editor: GridMapWidget = editor  # to reinforce the type
         self.api_object: VoltageLevel = api_object  # to reinforce the type
 
-        self.radius = r * api_object.Vnom
-        print(f"VL created at x:{parent_center.x()}, y:{parent_center.y()}")
+        self.radius = r * api_object.Vnom * 0.01
+        # print(f"VL created at x:{parent_center.x()}, y:{parent_center.y()}")
 
         self.setAcceptHoverEvents(True)  # Enable hover events for the item
         # self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable)  # Allow moving the node
-        self.setFlag(self.GraphicsItemFlag.ItemIsSelectable | self.GraphicsItemFlag.ItemIsMovable)  # Allow selecting the node
+        self.setFlag(
+            self.GraphicsItemFlag.ItemIsSelectable | self.GraphicsItemFlag.ItemIsMovable)  # Allow selecting the node
 
         # Create a pen with reduced line width
         self.change_pen_width(0.5)
@@ -169,6 +174,18 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         self.hovered = False
         self.setNodeColor(self.colorInner, self.colorBorder)
 
+    def contextMenuEvent(self, event: QGraphicsSceneContextMenuEvent):
+        """
+
+        :param event:
+        """
+        menu = QMenu()
+
+        add_menu_entry(menu=menu,
+                       text="Add bus",
+                       icon_path="",
+                       function_ptr=self.add_bus)
+
     def setNodeColor(self, inner_color: QColor = None, border_color: QColor = None) -> None:
         """
 
@@ -206,3 +223,14 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         pen = self.pen()
         pen.setWidth(width)
         self.setPen(pen)
+
+    def add_bus(self):
+        """
+        Add bus
+        """
+        bus = Bus(name=f"Bus {self.api_object.name}",
+                  Vnom=self.api_object.Vnom,
+                  substation=self.parent.api_object,
+                  voltage_level=self.api_object)
+
+        self.editor.circuit.add_bus(obj=bus)

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/Tiles/tile_worker.py

@@ -10,14 +10,16 @@ from urllib import request
 from collections.abc import Callable
 from PySide6.QtGui import QPixmap
 from PySide6.QtCore import QThread
-from GridCal.Gui.Diagrams.MapWidget.logger import log
-
 
 # SSL magic to solve the certificates hell
 # https://stackoverflow.com/questions/68275857/urllib-error-urlerror-urlopen-error-ssl-certificate-verify-failed-certifica
 ssl._create_default_https_context = ssl._create_stdlib_context
 
 
+def log(val: str):
+    print(val)
+
+
 class TileWorker(QThread):
     """Thread class that gets request from queue, loads tile, calls callback."""
 

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/Tiles/tiles.py

@@ -18,7 +18,10 @@ from typing import List, Union
 from collections.abc import Callable
 from GridCal.Gui.Diagrams.MapWidget.Tiles.base_tiles import BaseTiles
 from GridCal.Gui.Diagrams.MapWidget.Tiles.tile_worker import TileWorker
-from GridCal.Gui.Diagrams.MapWidget.logger import log
+
+
+def log(val: str):
+    print(val)
 
 # # set how old disk-cache tiles can be before we re-request them from the
 # # server.  this is the number of days old a tile is before we re-request.

{GridCal-5.1.20 → GridCal-5.1.21}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -50,6 +50,7 @@ from GridCal.Gui.Diagrams.MapWidget.Substation.node_graphic_item import NodeGrap
 from GridCal.Gui.Diagrams.MapWidget.Substation.substation_graphic_item import SubstationGraphicItem
 from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
 from GridCal.Gui.Diagrams.MapWidget.map_widget import MapWidget
+from GridCal.Gui.Diagrams.MapWidget.new_line_dialogue import NewMapLineDialogue
 import GridCal.Gui.Visualization.visualization as viz
 import GridCalEngine.Devices.Diagrams.palettes as palettes
 from GridCal.Gui.Diagrams.graphics_manager import ALL_MAP_GRAPHICS
@@ -79,7 +80,7 @@ def haversine_distance(lat1: float, lon1: float, lat2: float, lon2: float) -> fl
     return R * c
 
 
-def compare_options(it1: NodeGraphicItem, it2: NodeGraphicItem) -> Tuple[NodeGraphicItem, NodeGraphicItem]:
+def compare_options(it1: NodeGraphicItem, it2: NodeGraphicItem):
     """
 
     :param it1:
@@ -105,9 +106,9 @@ def compare_options(it1: NodeGraphicItem, it2: NodeGraphicItem) -> Tuple[NodeGra
                                          first_first_lat, first_first_long)
 
     if distance_1_to_2 <= distance_2_to_1:
-        return it1, it2
+        return it1, it2, it1.line_container.api_object.bus_from, it2.line_container.api_object.bus_to
     else:
-        return it2, it1
+        return it2, it1, it2.line_container.api_object.bus_from, it1.line_container.api_object.bus_to
 
 
 class MapLibraryModel(QStandardItemModel):
@@ -441,26 +442,35 @@ class GridMapWidget(BaseDiagramWidget):
 
         :return:
         """
-        if len(self.map.view.selectedItems) < 2:
+
+        selected_items = self.map.view._scene.selectedItems()
+        selectedItems = []
+        for item in selected_items:
+            selectedItems.append(item)
+
+        if len(selectedItems) < 2:
             return 0
 
-        it1 = self.map.view.selectedItems[0]
-        it2 = self.map.view.selectedItems[1]
+        it1 = selectedItems[0]
+        it2 = selectedItems[1]
 
         if it1 == it2:
             return 0
 
         newline = Line()
-        newline.copyData(it1.line_container.api_object)
+        newline.set_data_from(it1.line_container.api_object)
         # ln1 = self.api_object.copy()
 
-        better_first, better_second = compare_options(it1, it2)
+        better_first, better_second, busfrom, busto = compare_options(it1, it2)
 
         first_list = better_first.line_container.api_object.locations.data
         second_list = better_second.line_container.api_object.locations.data
 
         newline.locations.data = first_list + second_list
 
+        newline.bus_from = busfrom
+        newline.bus_to = busto
+
         idx = 0
         for nod in better_first.line_container.nodes_list:
             newline.locations.data[idx].lat = nod.lat
@@ -477,6 +487,34 @@ class GridMapWidget(BaseDiagramWidget):
         better_first.line_container.disable_line()
         better_second.line_container.disable_line()
 
+    def createNewLineWizard(self):
+        """
+        Create a new line in the map with dialogues
+        """
+
+        selected_items = self.map.view._scene.selectedItems()
+        selectedItems = []
+        for item in selected_items:
+            selectedItems.append(item)
+
+        if len(selectedItems) < 2:
+            return 0
+
+        it1: SubstationGraphicItem = selectedItems[0]
+        it2: SubstationGraphicItem = selectedItems[1]
+
+        if it1 == it2:
+            return None
+
+        dialog = NewMapLineDialogue(grid=self.circuit, se_from=it1.api_object, se_to=it2.api_object)
+        dialog.exec()
+        if dialog.is_valid():
+            bus1 = dialog.bus_from()
+            bus2 = dialog.bus_to()
+            if bus1 is not None and bus2 is not None:
+                newline = Line(bus_from=bus1, bus_to=bus2)
+                self.add_api_line(newline, original=True)
+
     def removeNode(self, node: NodeGraphicItem):
         """
         Removes node from diagram and scene
@@ -801,15 +839,16 @@ class GridMapWidget(BaseDiagramWidget):
             y0 = point0.y()
             lat, lon = self.to_lat_lon(x=x0, y=y0)
 
-            print(f"Droped at x:{x0}, y:{y0}, lat:{lat}, lon:{lon}")
+            # print(f"Dropped at x:{x0}, y:{y0}, lat:{lat}, lon:{lon}")
 
             if obj_type == self.library_model.get_substation_mime_data():
-                print("Create substation...")
+
                 api_object = Substation(name=f"Substation {self.circuit.get_substation_number()}",
                                         latitude=lat,
                                         longitude=lon)
                 self.circuit.add_substation(obj=api_object)
-                self.add_api_substation(api_object=api_object, lat=lat, lon=lon)
+                substation_graphics = self.add_api_substation(api_object=api_object, lat=lat, lon=lon)
+                substation_graphics.add_voltage_level()
 
     def wheelEvent(self, event: QWheelEvent):
         """
@@ -911,7 +950,7 @@ class GridMapWidget(BaseDiagramWidget):
 
         voltage_cmap = viz.get_voltage_color_map()
         loading_cmap = viz.get_loading_color_map()
-        bus_types = ['', 'PQ', 'PV', 'Slack', 'None', 'Storage']
+        bus_types = ['', 'PQ', 'PV', 'Slack', 'PQV', 'P']
 
         vmin = 0
         vmax = 1.2