VeraGrid 5.6.10__tar.gz → 5.6.12__tar.gz

{veragrid-5.6.10 → veragrid-5.6.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.6.10
+Version: 5.6.12
 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.6.10 → veragrid-5.6.12}/VeraGrid/ExecuteVeraGrid.py

@@ -40,8 +40,6 @@ elif os.name == "posix" or sys.platform.startswith("linux"):
             print(f"Could not set process name: {e}")
 
 
-
-
 if __name__ == "__main__":
     print('Loading VeraGrid...')
     # check_all_svgs()

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/AboutDialogue/about_dialogue.py

@@ -10,7 +10,7 @@ from PySide6 import QtWidgets
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QClipboard
 from typing import List
-from VeraGrid.Gui.AboutDialogue.gui import Ui_AboutDialog
+from VeraGrid.Gui.AboutDialogue.about_gui import Ui_AboutDialog
 from VeraGrid.__version__ import __VeraGrid_VERSION__
 from VeraGrid.update import check_version, get_upgrade_command
 from VeraGridEngine.__version__ import __VeraGridEngine_VERSION__, copyright_msg, contributors_msg

veragrid-5.6.10/VeraGrid/Gui/AboutDialogue/gui.py → veragrid-5.6.12/VeraGrid/Gui/AboutDialogue/about_gui.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'about_gui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.10.1
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -19,7 +19,7 @@ from PySide6.QtWidgets import (QApplication, QDialog, QGridLayout, QHeaderView,
     QLabel, QPushButton, QSizePolicy, QSpacerItem,
     QTabWidget, QTableWidget, QTableWidgetItem, QTextEdit,
     QVBoxLayout, QWidget)
-from .icons_rc import *
+from VeraGrid.Gui.Icons.icons_rc import *
 
 class Ui_AboutDialog(object):
     def setupUi(self, AboutDialog):
@@ -27,7 +27,7 @@ class Ui_AboutDialog(object):
             AboutDialog.setObjectName(u"AboutDialog")
         AboutDialog.resize(640, 365)
         icon = QIcon()
-        icon.addFile(u":/Icons/icons/VeraGrid_icon.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon.addFile(u":/Program icon/icons/VeraGrid_icon.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         AboutDialog.setWindowIcon(icon)
         self.verticalLayout_2 = QVBoxLayout(AboutDialog)
         self.verticalLayout_2.setObjectName(u"verticalLayout_2")
@@ -79,6 +79,14 @@ class Ui_AboutDialog(object):
 
         self.gridLayout.addWidget(self.copyrightLabel, 4, 1, 1, 2)
 
+        self.label_3 = QLabel(self.tab)
+        self.label_3.setObjectName(u"label_3")
+        self.label_3.setMaximumSize(QSize(32, 32))
+        self.label_3.setPixmap(QPixmap(u":/Program icon/icons/VeraGrid_icon.png"))
+        self.label_3.setScaledContents(True)
+
+        self.gridLayout.addWidget(self.label_3, 3, 0, 2, 1)
+
         self.tabWidget.addTab(self.tab, "")
         self.tab_2 = QWidget()
         self.tab_2.setObjectName(u"tab_2")
@@ -98,12 +106,18 @@ class Ui_AboutDialog(object):
         self.gridLayout_3.setObjectName(u"gridLayout_3")
         self.copyLibsButton = QPushButton(self.tab_5)
         self.copyLibsButton.setObjectName(u"copyLibsButton")
+        icon1 = QIcon()
+        icon1.addFile(u":/Icons/icons/copy.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.copyLibsButton.setIcon(icon1)
 
         self.gridLayout_3.addWidget(self.copyLibsButton, 2, 5, 1, 1)
 
         self.updateButton = QPushButton(self.tab_5)
         self.updateButton.setObjectName(u"updateButton")
         self.updateButton.setMaximumSize(QSize(80, 16777215))
+        icon2 = QIcon()
+        icon2.addFile(u":/Icons/icons/sync.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.updateButton.setIcon(icon2)
 
         self.gridLayout_3.addWidget(self.updateButton, 2, 0, 1, 1)
 
@@ -172,11 +186,18 @@ class Ui_AboutDialog(object):
         self.label.setText("")
         self.versionLabel.setText(QCoreApplication.translate("AboutDialog", u"version", None))
         self.copyrightLabel.setText(QCoreApplication.translate("AboutDialog", u"Copyright", None))
+        self.label_3.setText("")
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QCoreApplication.translate("AboutDialog", u"About", None))
         self.contributorsLabel.setText(QCoreApplication.translate("AboutDialog", u"TextLabel", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QCoreApplication.translate("AboutDialog", u"Contributors", None))
-        self.copyLibsButton.setText(QCoreApplication.translate("AboutDialog", u"Copy", None))
-        self.updateButton.setText(QCoreApplication.translate("AboutDialog", u"Update", None))
+#if QT_CONFIG(tooltip)
+        self.copyLibsButton.setToolTip(QCoreApplication.translate("AboutDialog", u"Copy the table", None))
+#endif // QT_CONFIG(tooltip)
+        self.copyLibsButton.setText("")
+#if QT_CONFIG(tooltip)
+        self.updateButton.setToolTip(QCoreApplication.translate("AboutDialog", u"Update VeraGrid. If you are on windows don't do this.", None))
+#endif // QT_CONFIG(tooltip)
+        self.updateButton.setText("")
         self.updateLabel.setText("")
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), QCoreApplication.translate("AboutDialog", u"Libraries", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QCoreApplication.translate("AboutDialog", u"Optional libraries", None))
@@ -187,7 +208,7 @@ class Ui_AboutDialog(object):
 "hr { height: 1px; border-width: 0; }\n"
 "li.unchecked::marker { content: \"\\2610\"; }\n"
 "li.checked::marker { content: \"\\2612\"; }\n"
-"</style></head><body style=\" font-family:'Cousine'; font-size:13pt; font-weight:400; font-style:normal;\">\n"
+"</style></head><body style=\" font-family:'Cousine'; font-size:10pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+==============+==========================================+</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| Package      | License                                  |</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; mar"

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/AboutDialogue/update_gui_file.py

@@ -8,6 +8,5 @@ Script to update correctly the main GUI (.py) file from the Qt design (.ui) file
 from VeraGrid.Gui.update_gui_common import convert_resource_file, convert_ui_file
 
 if __name__ == '__main__':
-    convert_resource_file(source='icons.qrc')
-    for f in ['gui.ui']:
+    for f in ['about_gui.ui']:
         convert_ui_file(source=f)

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/Analysis/AnalysisDialogue.py

@@ -5,7 +5,7 @@
 
 from typing import List
 from PySide6 import QtWidgets
-from VeraGrid.Gui.Analysis.gui import Ui_MainWindow
+from VeraGrid.Gui.Analysis.analysis_gui import Ui_MainWindow
 from VeraGrid.Gui.Analysis.object_plot_analysis import grid_analysis, GridErrorLog, FixableErrorOutOfRange
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGrid.Gui.general_dialogues import LogsDialogue, Logger

veragrid-5.6.10/VeraGrid/Gui/Analysis/gui.py → veragrid-5.6.12/VeraGrid/Gui/Analysis/analysis_gui.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'analysis_gui.ui'
 ##
 ## Created by: Qt User Interface Compiler version 6.9.2
 ##
@@ -21,7 +21,7 @@ from PySide6.QtWidgets import (QApplication, QCheckBox, QDoubleSpinBox, QFrame,
     QMainWindow, QSizePolicy, QSpacerItem, QStatusBar,
     QTabWidget, QToolBar, QTreeView, QVBoxLayout,
     QWidget)
-from .icons_rc import *
+from VeraGrid.Gui.Icons.icons_rc import *
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
@@ -34,16 +34,18 @@ class Ui_MainWindow(object):
         self.actionSave_diagnostic = QAction(MainWindow)
         self.actionSave_diagnostic.setObjectName(u"actionSave_diagnostic")
         icon1 = QIcon()
-        icon1.addFile(u":/icons/icons/savec.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon1.addFile(u":/Icons/icons/savec.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.actionSave_diagnostic.setIcon(icon1)
         self.actionFix_issues = QAction(MainWindow)
         self.actionFix_issues.setObjectName(u"actionFix_issues")
         icon2 = QIcon()
-        icon2.addFile(u":/icons/icons/fix.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon2.addFile(u":/Icons/icons/fix.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.actionFix_issues.setIcon(icon2)
         self.actionAnalyze = QAction(MainWindow)
         self.actionAnalyze.setObjectName(u"actionAnalyze")
-        self.actionAnalyze.setIcon(icon)
+        icon3 = QIcon()
+        icon3.addFile(u":/Icons/icons/inputs_analysis 2.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.actionAnalyze.setIcon(icon3)
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.verticalLayout_2 = QVBoxLayout(self.centralwidget)
@@ -58,7 +60,7 @@ class Ui_MainWindow(object):
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.logsTreeView = QTreeView(self.tab)
         self.logsTreeView.setObjectName(u"logsTreeView")
-        self.logsTreeView.setFrameShape(QFrame.NoFrame)
+        self.logsTreeView.setFrameShape(QFrame.Shape.NoFrame)
 
         self.verticalLayout.addWidget(self.logsTreeView)
 
@@ -70,8 +72,8 @@ class Ui_MainWindow(object):
         self.frame = QFrame(self.tab_2)
         self.frame.setObjectName(u"frame")
         self.frame.setMaximumSize(QSize(400, 16777215))
-        self.frame.setFrameShape(QFrame.NoFrame)
-        self.frame.setFrameShadow(QFrame.Raised)
+        self.frame.setFrameShape(QFrame.Shape.NoFrame)
+        self.frame.setFrameShadow(QFrame.Shadow.Raised)
         self.gridLayout = QGridLayout(self.frame)
         self.gridLayout.setObjectName(u"gridLayout")
         self.label_4 = QLabel(self.frame)
@@ -260,8 +262,8 @@ class Ui_MainWindow(object):
 
         self.frame_2 = QFrame(self.tab_2)
         self.frame_2.setObjectName(u"frame_2")
-        self.frame_2.setFrameShape(QFrame.NoFrame)
-        self.frame_2.setFrameShadow(QFrame.Raised)
+        self.frame_2.setFrameShape(QFrame.Shape.NoFrame)
+        self.frame_2.setFrameShadow(QFrame.Shadow.Raised)
         self.gridLayout_2 = QGridLayout(self.frame_2)
         self.gridLayout_2.setObjectName(u"gridLayout_2")
         self.label_8 = QLabel(self.frame_2)
@@ -305,9 +307,9 @@ class Ui_MainWindow(object):
 
         self.horizontalLayout.addItem(self.horizontalSpacer)
 
-        icon3 = QIcon()
-        icon3.addFile(u":/icons/icons/gear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.tabWidget.addTab(self.tab_2, icon3, "")
+        icon4 = QIcon()
+        icon4.addFile(u":/icons/icons/gear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.tabWidget.addTab(self.tab_2, icon4, "")
 
         self.verticalLayout_2.addWidget(self.tabWidget)
 

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/Analysis/update_gui_file.py

@@ -17,9 +17,7 @@ if __name__ == '__main__':
         rcc_cmd += '.exe'
         uic_cmd += '.exe'
 
-    convert_resource_file(source='icons.qrc', rcc_cmd=rcc_cmd)
-
-    for f in ['gui.ui']:
+    for f in ['analysis_gui.ui']:
         convert_ui_file(source=f, uic_cmd=uic_cmd)
 
 

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/ContingencyPlanner/contingency_planner_dialogue.py

@@ -6,7 +6,7 @@ import sys
 from PySide6 import QtWidgets
 from typing import List
 
-from VeraGrid.Gui.ContingencyPlanner.gui import Ui_MainWindow
+from VeraGrid.Gui.ContingencyPlanner.contingency_planner_gui import Ui_MainWindow
 import VeraGridEngine.Devices as dev
 from VeraGridEngine.enumerations import DeviceType
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit

veragrid-5.6.10/VeraGrid/Gui/ContingencyPlanner/gui.py → veragrid-5.6.12/VeraGrid/Gui/ContingencyPlanner/contingency_planner_gui.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'contingency_planner_gui.ui'
 ##
 ## Created by: Qt User Interface Compiler version 6.9.2
 ##
@@ -20,7 +20,7 @@ from PySide6.QtWidgets import (QApplication, QCheckBox, QDialog, QDoubleSpinBox,
     QFormLayout, QFrame, QGridLayout, QHBoxLayout,
     QLabel, QListView, QPushButton, QSizePolicy,
     QSpacerItem, QSpinBox, QVBoxLayout, QWidget)
-from .icons_rc import *
+from VeraGrid.Gui.Icons.icons_rc import *
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):

{veragrid-5.6.10/VeraGrid/Gui/SyncDialogue → veragrid-5.6.12/VeraGrid/Gui/ContingencyPlanner}/update_gui_file.py

@@ -2,12 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
+
 """
 Script to update correctly the main GUI (.py) file from the Qt design (.ui) file
 """
 from VeraGrid.Gui.update_gui_common import convert_resource_file, convert_ui_file
 
 if __name__ == '__main__':
-    convert_resource_file(source='icons.qrc')
-    for f in ['gui.ui']:
+    for f in ['contingency_planner_gui.ui']:
         convert_ui_file(source=f)

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/CoordinatesInput/coordinates_dialogue.py

@@ -7,7 +7,7 @@ import sys
 import pandas as pd
 from PySide6 import QtGui, QtCore, QtWidgets
 from typing import List, Tuple, Union
-from VeraGrid.Gui.CoordinatesInput.gui import Ui_Dialog
+from VeraGrid.Gui.CoordinatesInput.coordinates_input_gui import Ui_Dialog
 from VeraGrid.Gui.ProfilesInput.excel_dialog import ExcelDialog
 from VeraGrid.Gui.general_dialogues import LogsDialogue
 from VeraGridEngine.Devices.Substation import Bus

veragrid-5.6.10/VeraGrid/Gui/CoordinatesInput/gui.py → veragrid-5.6.12/VeraGrid/Gui/CoordinatesInput/coordinates_input_gui.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'coordinates_input_gui.ui'
 ##
 ## Created by: Qt User Interface Compiler version 6.9.2
 ##
@@ -19,7 +19,7 @@ from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QDialog,
     QFrame, QGridLayout, QHeaderView, QLabel,
     QPushButton, QRadioButton, QSizePolicy, QSpacerItem,
     QSplitter, QTableView, QVBoxLayout, QWidget)
-from .icons_rc import *
+from VeraGrid.Gui.Icons.icons_rc import *
 
 class Ui_Dialog(object):
     def setupUi(self, Dialog):

veragrid-5.6.12/VeraGrid/Gui/CoordinatesInput/update_gui_file.py

@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+
+"""
+Script to update correctly the main GUI (.py) file from the Qt design (.ui) file
+"""
+from VeraGrid.Gui.update_gui_common import convert_resource_file, convert_ui_file
+
+if __name__ == '__main__':
+    for f in ['coordinates_input_gui.ui']:
+        convert_ui_file(source=f)

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/Diagrams/MapWidget/Injections/map_injections_template_graphics.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 from typing import TYPE_CHECKING, List, Union
-from PySide6.QtCore import Qt
+from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QPen, QCursor, QColor, QBrush
 from PySide6.QtWidgets import (QGraphicsEllipseItem, QMenu,
                                QGraphicsSceneContextMenuEvent,
@@ -100,6 +100,37 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
 
         return color
 
+    def mousePressEvent(self, event: QGraphicsSceneMouseEvent):
+        """
+        Event handler for mouse press events.
+        """
+        super().mousePressEvent(event)
+        # selected_items = self.editor.map.view.selected_items()
+        # if len(selected_items) < 2:
+        self.setSelected(True)
+
+        event.setAccepted(True)
+        self.editor.map.view.disable_move = True
+
+        if self.api_object is not None:
+            self.editor.set_editor_model(api_object=self.api_object)
+
+    def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent):
+        """
+        Event handler for mouse release events.
+        """
+        # super().mouseReleaseEvent(event)
+        self.editor.disableMove = True
+        self.update_position_at_the_diagram()  # always update
+
+    def mouseMoveEvent(self, event: QGraphicsSceneMouseEvent) -> None:
+        """
+        Event handler for mouse move events.
+        """
+
+        pos = self.mapToScene(event.pos())
+        self.refresh(pos=pos)
+
     def update_position_at_the_diagram(self) -> None:
         """
         Updates the element position in the diagram (to save)
@@ -115,6 +146,21 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
                                            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())
+
+
+        self.update_position_at_the_diagram()  # always update
+
     def set_size(self, r: float):
         """
 
@@ -162,22 +208,6 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
         # plot the profiles
         self.api_object.plot_profiles(time=ts)
 
-    def mousePressEvent(self, event: QGraphicsSceneMouseEvent):
-        """
-        mouse press: display the editor
-        :param event:
-        :return:
-        """
-        super().mousePressEvent(event)
-        self._editor.set_editor_model(api_object=self.api_object)
-
-    def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent):
-        """
-        Event handler for mouse release events.
-        """
-        super().mouseReleaseEvent(event)
-        # self.editor.disableMove = True
-        self.update_position_at_the_diagram()  # always update
 
     def mouseDoubleClickEvent(self, event, /):
         """
@@ -202,7 +232,7 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
 
         add_menu_entry(menu=menu,
                        text="Consolidate coordinates",
-                       function_ptr=self.consolidate_coordinates,
+                       function_ptr=self.editor.consolidate_object_coordinates,
                        icon_path=":/Icons/icons/assign_to_profile.png")
 
         menu.addSeparator()

{veragrid-5.6.10 → veragrid-5.6.12}/VeraGrid/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 import ast
 import os
-from typing import Union, List, Set, Tuple, Dict, TYPE_CHECKING
+from typing import Union, List, Tuple, Dict, TYPE_CHECKING
 import json
 import numpy as np
 import math
@@ -135,7 +135,7 @@ class MapLibraryModel(QStandardItemModel):
         :return: QByteArray
         """
         data = QByteArray()
-        stream = QDataStream(data, QIODevice.WriteOnly)
+        stream = QDataStream(data, QIODevice.OpenModeFlag.WriteOnly)
         stream.writeQString(val)
         return data
 
@@ -165,7 +165,7 @@ class MapLibraryModel(QStandardItemModel):
                 txt = self.data(idx, Qt.ItemDataRole.DisplayRole)
 
                 data = QByteArray()
-                stream = QDataStream(data, QIODevice.WriteOnly)
+                stream = QDataStream(data, QIODevice.OpenModeFlag.WriteOnly)
                 stream.writeQString(txt)
 
                 mime_data.setData('component/name', data)
@@ -373,6 +373,18 @@ class GridMapWidget(BaseDiagramWidget):
                 selected_substations.append((item.api_object, item))
         return selected_substations
 
+    def get_selected_generators_tup(self) -> List[Tuple[Generator, MapGeneratorGraphicItem]]:
+        """
+        Get only selected generators from the scene
+
+        :return: List of (Generator, GeneratorGraphicItem) tuples
+        """
+        selected_generators = []
+        for item in self.diagram_scene.selectedItems():
+            if hasattr(item, 'api_object') and isinstance(item, MapGeneratorGraphicItem):
+                selected_generators.append((item.api_object, item))
+        return selected_generators
+
     def get_selected_linelocations_tup(self) -> List[Tuple[LineLocation, LineLocationGraphicItem]]:
         """
         Get only selected Line Locations from the scene
@@ -2087,6 +2099,7 @@ class GridMapWidget(BaseDiagramWidget):
     def consolidate_object_coordinates(self):
         selected_lines = self.get_selected_line_segments_tup()
         selected_substations = self.get_selected_substations_tup()
+        selected_generators = self.get_selected_generators_tup()
         line_graphics_list = []
         for subst, subst_graphic in selected_substations:
             subst.latitude = subst_graphic.lat
@@ -2098,6 +2111,10 @@ class GridMapWidget(BaseDiagramWidget):
                 gelm.api_object.lat = gelm.lat
                 gelm.api_object.long = gelm.lon
 
+        for gen, gen_graphic in selected_generators:
+            gen.latitude = gen_graphic.lat
+            gen.longitude = gen_graphic.lon
+
         ok = yes_no_question(title='Update lengths?',
                              text='Do you want to update lengths of lines? \n'
                                   'IMPORTANT: This will take into account every movement of substation and line '
@@ -3111,154 +3128,3 @@ def generate_map_diagram(
 
     return diagram
 
-
-def get_devices_to_expand(circuit: MultiCircuit, substations: List[Substation], max_level: int = 1,
-                          expand_outside: bool = True) -> Tuple[
-    List[Substation],
-    List[VoltageLevel],
-    List[Line],
-    List[DcLine],
-    List[HvdcLine]]:
-    """
-    get lists of devices to expand given a root bus
-    :param circuit: MultiCircuit
-    :param substations: List of Bus
-    :param max_level: max expansion level
-    :param expand_outside: whether to expand outside of the given references using the branches
-    :return:
-    """
-
-    # get all Branches
-    all_branches = circuit.lines + circuit.dc_lines + circuit.hvdc_lines
-
-    # create a pool of buses that belong to the substations
-    # store the bus objects and their level from the root
-    bus_pool = [(b, 0) for b in circuit.buses if b.substation in substations]
-
-    voltage_levels = set()
-    substations_extended = set()
-    selected_branches = set()
-
-    while len(bus_pool) > 0:
-
-        # search the next bus
-        bus, level = bus_pool.pop()
-
-        if bus.voltage_level is not None:
-            voltage_levels.add(bus.voltage_level)
-            if bus.substation not in substations_extended:
-                substations_extended.add(bus.substation)
-
-        if level < max_level:
-
-            for i, br in enumerate(all_branches):
-
-                if br.bus_from == bus:
-                    if expand_outside:
-                        bus_pool.append((br.bus_to, level + 1))
-                    selected_branches.add(br)
-
-                elif br.bus_to == bus:
-                    if expand_outside:
-                        bus_pool.append((br.bus_from, level + 1))
-                    selected_branches.add(br)
-
-                else:
-                    pass
-
-    # sort Branches
-    lines: List[Line] = list()
-    dc_lines: List[DcLine] = list()
-    hvdc_lines: List[HvdcLine] = list()
-
-    for obj in selected_branches:
-
-        if obj.device_type == DeviceType.LineDevice:
-            lines.append(obj)
-
-        elif obj.device_type == DeviceType.DCLineDevice:
-            dc_lines.append(obj)
-
-
-        elif obj.device_type == DeviceType.HVDCLineDevice:
-            hvdc_lines.append(obj)
-
-        else:
-            raise Exception(f'Unrecognized branch type {obj.device_type.value}')
-
-    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,
-                                  substations: List[Substation] | Set[Substation],
-                                  prog_func: Union[Callable, None] = None,
-                                  text_func: Union[Callable, None] = None,
-                                  use_flow_based_width: bool = False,
-                                  min_branch_width: int = 1.0,
-                                  max_branch_width=5,
-                                  min_bus_width=1.0,
-                                  max_bus_width=20,
-                                  arrow_size=20,
-                                  palette: Colormaps = Colormaps.VeraGrid,
-                                  default_bus_voltage: float = 10,
-                                  expand_outside: bool = True,
-                                  name="Map diagram"):
-    """
-    Create a vicinity diagram
-    :param circuit: MultiCircuit
-    :param substations: List of Bus
-    :param prog_func:
-    :param text_func:
-    :param use_flow_based_width: use flow based width
-    :param min_branch_width: minimum branch width
-    :param max_branch_width: maximum branch width
-    :param min_bus_width:
-    :param max_bus_width: maximum bus width
-    :param arrow_size: arrow size
-    :param palette: Colormaps
-    :param default_bus_voltage: default bus voltage
-    :param expand_outside: whether to expand outside the given references using the branches
-    :param name: Name of the diagram
-    :return:
-    """
-
-    (substations_extended, voltage_levels,
-     lines, dc_lines, hvdc_lines) = get_devices_to_expand(circuit=circuit,
-                                                          substations=substations,
-                                                          max_level=1,
-                                                          expand_outside=expand_outside)
-
-    # Draw schematic subset
-    diagram = generate_map_diagram(
-        substations=substations_extended,
-        voltage_levels=voltage_levels,
-        lines=lines,
-        dc_lines=dc_lines,
-        hvdc_lines=hvdc_lines,
-        fluid_nodes=list(),
-        fluid_paths=list(),
-        external_grids=list(),
-        static_generators=list(),
-        loads=list(),
-        batteries=list(),
-        generators=list(),
-        prog_func=prog_func,
-        text_func=text_func,
-        name=name,
-        use_flow_based_width=use_flow_based_width,
-        min_branch_width=min_branch_width,
-        max_branch_width=max_branch_width,
-        min_bus_width=min_bus_width,
-        max_bus_width=max_bus_width,
-        arrow_size=arrow_size,
-        palette=palette,
-        default_bus_voltage=default_bus_voltage
-    )
-
-    return diagram