GridCal 5.1.17__tar.gz → 5.1.19__tar.gz

{GridCal-5.1.17 → GridCal-5.1.19}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -50,7 +50,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                  api_object: Substation,
                  lat: float,
                  lon: float,
-                 r: float = 0.4,
+                 r: float = 0.8,
                  draw_labels: bool = True):
         """
 
@@ -147,13 +147,22 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         lat, long = self.editor.to_lat_lon(self.rect().x(), self.rect().y())
 
-        print(f'Updating SE position id:{self.api_object.idtag}, lat:{lat}, lon:{long}')
+        # print(f'Updating SE position id:{self.api_object.idtag}, lat:{lat}, lon:{long}')
 
         self.editor.update_diagram_element(device=self.api_object,
                                            latitude=lat,
                                            longitude=long,
                                            graphic_object=self)
 
+    def get_center_pos(self) -> QPointF:
+        """
+
+        :return:
+        """
+        x = self.rect().x() + self.rect().width() / 2
+        y = self.rect().y() + self.rect().height() / 2
+        return QPointF(x, y)
+
     def mouseMoveEvent(self, event: QtWidgets.QGraphicsSceneMouseEvent) -> None:
         """
         Event handler for mouse move events.
@@ -171,22 +180,17 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                 vl_graphics.center_on_substation()
 
             self.editor.update_connectors()
-
-    def get_center_pos(self) -> QPointF:
-        """
-
-        :return:
-        """
-        x = self.rect().x() + self.rect().width() / 2
-        y = self.rect().y() + self.rect().height() / 2
-        return QPointF(x, y)
+            self.updateDiagram()  # always update
 
     def mousePressEvent(self, event: QGraphicsSceneMouseEvent):
         """
         Event handler for mouse press events.
         """
+        super().mousePressEvent(event)
+        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={
@@ -202,8 +206,10 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         Event handler for mouse release events.
         """
+        # super().mouseReleaseEvent(event)
         self.editor.disableMove = True
         self.updateDiagram()  # always update
+        print("SE mouse release")
 
     def hoverEnterEvent(self, event: QtWidgets.QGraphicsSceneHoverEvent) -> None:
         """
@@ -248,6 +254,11 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                        icon_path="",
                        function_ptr=self.add_function)
 
+        add_menu_entry(menu=menu,
+                       text="Show diagram",
+                       icon_path="",
+                       function_ptr=self.new_substation_diagram)
+
         menu.exec_(event.screenPos())
 
     def add_function(self):
@@ -265,8 +276,10 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
             lines_info = []
 
             for idtag, graphic_object in dev_dict.items():
-                substation_from_graphics = self.editor.graphics_manager.query(elm=graphic_object.api_object.get_substation_from())
-                substation_to_graphics = self.editor.graphics_manager.query(elm=graphic_object.api_object.get_substation_to())
+                substation_from_graphics = self.editor.graphics_manager.query(
+                    elm=graphic_object.api_object.get_substation_from())
+                substation_to_graphics = self.editor.graphics_manager.query(
+                    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
@@ -301,6 +314,13 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
             self.move_to(lat=self.api_object.latitude, lon=self.api_object.longitude)
             self.editor.update_connectors()
 
+    def new_substation_diagram(self):
+        """
+        Function to create a new substation
+        :return:
+        """
+        self.editor.new_substation_diagram(substation=self.api_object)
+
     def add_voltage_level(self) -> None:
         """
         Add Voltage Level

{GridCal-5.1.17 → GridCal-5.1.19}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -207,7 +207,13 @@ class GridMapWidget(BaseDiagramWidget):
                  name: str,
                  circuit: MultiCircuit,
                  diagram: Union[None, MapDiagram] = None,
-                 call_delete_db_element_func: Callable[["GridMapWidget", ALL_DEV_TYPES], None] = None):
+                 use_flow_based_width: bool = False,
+                 min_branch_width: int = 5,
+                 max_branch_width=5,
+                 min_bus_width=20,
+                 max_bus_width=20,
+                 call_delete_db_element_func: Callable[["GridMapWidget", ALL_DEV_TYPES], None] = None,
+                 call_new_substation_diagram_func: Callable[[Substation], None] = None, ):
         """
 
         :param tile_src:
@@ -228,6 +234,11 @@ class GridMapWidget(BaseDiagramWidget):
                                                       latitude=latitude) if diagram is None else diagram,
                                    library_model=MapLibraryModel(),
                                    time_index=None,
+                                   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,
                                    call_delete_db_element_func=call_delete_db_element_func)
 
         # declare the map
@@ -247,6 +258,9 @@ class GridMapWidget(BaseDiagramWidget):
         self.map.startLat = latitude
         self.map.startLon = longitude
 
+        # function pointer to call for a new substation diagram
+        self.call_new_substation_diagram_func = call_new_substation_diagram_func
+
         self.startHe = self.map.view.height()
         self.startWi = self.map.view.width()
         self.constantLineWidth = True
@@ -806,21 +820,21 @@ class GridMapWidget(BaseDiagramWidget):
         :return:
         """
 
-        pass
+        # SANTIAGO: NO TOCAR ESTO ES EL COMPORTAMIENTO DESEADO
 
-        # max_zoom = self.map.max_level
-        # min_zoom = self.map.min_level
-        # zoom = self.map.zoom_factor
-        # scale = 0.1 + (zoom - min_zoom) / (max_zoom - min_zoom)
-        #
-        # # rescale lines
-        # for dev_tpe in [DeviceType.LineDevice,
-        #                 DeviceType.DCLineDevice,
-        #                 DeviceType.HVDCLineDevice,
-        #                 DeviceType.FluidPathDevice]:
-        #     graphics_dict = self.graphics_manager.get_device_type_dict(device_type=dev_tpe)
-        #     for key, lne in graphics_dict.items():
-        #         lne.setWidthScale(scale)
+        max_zoom = self.map.max_level
+        min_zoom = self.map.min_level
+        zoom = self.map.zoom_factor
+        scale = self.min_branch_width + (zoom - min_zoom) / (max_zoom - min_zoom)
+
+        # rescale lines
+        for dev_tpe in [DeviceType.LineDevice,
+                        DeviceType.DCLineDevice,
+                        DeviceType.HVDCLineDevice,
+                        DeviceType.FluidPathDevice]:
+            graphics_dict = self.graphics_manager.get_device_type_dict(device_type=dev_tpe)
+            for key, lne in graphics_dict.items():
+                lne.setWidthScale(scale)
 
     def change_size_and_pen_width_all(self, new_radius, pen_width):
         """
@@ -1096,6 +1110,17 @@ class GridMapWidget(BaseDiagramWidget):
         else:
             raise Exception('Extension ' + str(extension) + ' not supported :(')
 
+    def new_substation_diagram(self, substation: Substation):
+        """
+
+        :param substation:
+        :return:
+        """
+        if self.call_new_substation_diagram_func is not None:
+            self.call_new_substation_diagram_func(substation)
+        else:
+            print("call_new_substation_diagram_func is None :( ")
+
 
 def generate_map_diagram(substations: List[Substation],
                          voltage_levels: List[VoltageLevel],

{GridCal-5.1.17 → GridCal-5.1.19}/GridCal/Gui/Diagrams/MapWidget/map_widget.py

@@ -74,7 +74,7 @@ class MapScene(QGraphicsScene):
         :param event:
         :return:
         """
-        print(f"Scene pressed at {event.scenePos()}")
+        # print(f"Scene pressed at {event.scenePos()}")
         super().mousePressEvent(event)
 
     def mouseReleaseEvent(self, event):
@@ -586,7 +586,7 @@ class MapWidget(QWidget):
         :param event:
         :return:
         """
-
+        super().mousePressEvent(event)
         click_x = event.x()
         click_y = event.y()
 

{GridCal-5.1.17 → GridCal-5.1.19}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -468,6 +468,11 @@ class SchematicWidget(BaseDiagramWidget):
                  default_bus_voltage: float = 10.0,
                  time_index: Union[None, int] = None,
                  prefer_node_breaker: bool = False,
+                 use_flow_based_width: bool = False,
+                 min_branch_width: int = 5,
+                 max_branch_width=5,
+                 min_bus_width=20,
+                 max_bus_width=20,
                  call_delete_db_element_func: Callable[["SchematicWidget", ALL_DEV_TYPES], None] = None):
         """
         Creates the Diagram Editor (DiagramEditorWidget)
@@ -483,6 +488,11 @@ class SchematicWidget(BaseDiagramWidget):
                                    diagram=diagram,
                                    library_model=SchematicLibraryModel(),
                                    time_index=time_index,
+                                   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,
                                    call_delete_db_element_func=call_delete_db_element_func)
 
         # create all the schematic objects and replace the existing ones

{GridCal-5.1.17 → GridCal-5.1.19}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -63,7 +63,13 @@ class BaseDiagramWidget(QSplitter):
                  diagram: Union[SchematicDiagram, MapDiagram],
                  library_model: Union[MapLibraryModel, SchematicLibraryModel],
                  time_index: Union[None, int] = None,
-                 call_delete_db_element_func: Callable[[Union[GridMapWidget, SchematicWidget], ALL_DEV_TYPES], None] = None):
+                 use_flow_based_width: bool = False,
+                 min_branch_width: int = 5,
+                 max_branch_width=5,
+                 min_bus_width=20,
+                 max_bus_width=20,
+                 call_delete_db_element_func: Callable[
+                     [Union[GridMapWidget, SchematicWidget], ALL_DEV_TYPES], None] = None):
         """
         Constructor
         :param circuit:
@@ -120,6 +126,13 @@ class BaseDiagramWidget(QSplitter):
         # diagram to store the objects locations
         self.diagram: SchematicDiagram = diagram
 
+        # sizes
+        self.use_flow_based_width: bool = use_flow_based_width
+        self.min_branch_width: float = min_branch_width
+        self.max_branch_width: float = max_branch_width
+        self.min_bus_width: float = min_bus_width
+        self.max_bus_width: float = max_bus_width
+
         # class to handle the relationships between widgets and API objects
         self.graphics_manager = GraphicsManager()
 
@@ -572,3 +585,29 @@ class BaseDiagramWidget(QSplitter):
 
         if location is not None:
             location.draw_labels = draw_labels
+
+    def set_size_constraints(self,
+                             use_flow_based_width: bool = False,
+                             min_branch_width: int = 5,
+                             max_branch_width=5,
+                             min_bus_width=20,
+                             max_bus_width=20):
+        """
+        Set the size constraints
+        :param use_flow_based_width:
+        :param min_branch_width:
+        :param max_branch_width:
+        :param min_bus_width:
+        :param max_bus_width:
+        """
+        self.use_flow_based_width: bool = use_flow_based_width
+        self.min_branch_width: float = min_branch_width
+        self.max_branch_width: float = max_branch_width
+        self.min_bus_width: float = min_bus_width
+        self.max_bus_width: float = max_bus_width
+
+        # print(f"{self.use_flow_based_width}, "
+        #       f"{self.min_branch_width}, "
+        #       f"{self.max_branch_width}, "
+        #       f"{self.min_bus_width}, "
+        #       f"{self.max_bus_width}")

{GridCal-5.1.17 → GridCal-5.1.19}/GridCal/Gui/Main/MainWindow.py

@@ -738,10 +738,10 @@ class Ui_mainWindow(object):
 
         self.horizontalLayout_9.addWidget(self.associationsComboBox)
 
-        self.association_label = QLabel(self.frame_17)
-        self.association_label.setObjectName(u"association_label")
+        self.association_units_label = QLabel(self.frame_17)
+        self.association_units_label.setObjectName(u"association_units_label")
 
-        self.horizontalLayout_9.addWidget(self.association_label)
+        self.horizontalLayout_9.addWidget(self.association_units_label)
 
         self.horizontalSpacer_8 = QSpacerItem(794, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
@@ -3528,13 +3528,10 @@ class Ui_mainWindow(object):
         self.gridLayout = QGridLayout(self.frame_58)
         self.gridLayout.setObjectName(u"gridLayout")
         self.gridLayout.setContentsMargins(-1, 0, -1, -1)
-        self.max_branch_size_spinBox = QSpinBox(self.frame_58)
-        self.max_branch_size_spinBox.setObjectName(u"max_branch_size_spinBox")
-        self.max_branch_size_spinBox.setMinimum(5)
-        self.max_branch_size_spinBox.setMaximum(10000)
-        self.max_branch_size_spinBox.setValue(20)
+        self.label_14 = QLabel(self.frame_58)
+        self.label_14.setObjectName(u"label_14")
 
-        self.gridLayout.addWidget(self.max_branch_size_spinBox, 12, 1, 1, 1)
+        self.gridLayout.addWidget(self.label_14, 11, 0, 1, 1)
 
         self.label_56 = QLabel(self.frame_58)
         self.label_56.setObjectName(u"label_56")
@@ -3550,29 +3547,30 @@ class Ui_mainWindow(object):
 
         self.gridLayout.addWidget(self.label_56, 5, 0, 1, 1)
 
-        self.max_node_size_spinBox = QSpinBox(self.frame_58)
-        self.max_node_size_spinBox.setObjectName(u"max_node_size_spinBox")
-        self.max_node_size_spinBox.setMinimum(20)
-        self.max_node_size_spinBox.setMaximum(10000)
-        self.max_node_size_spinBox.setValue(40)
+        self.label_43 = QLabel(self.frame_58)
+        self.label_43.setObjectName(u"label_43")
 
-        self.gridLayout.addWidget(self.max_node_size_spinBox, 7, 1, 1, 1)
+        self.gridLayout.addWidget(self.label_43, 2, 0, 1, 1)
 
         self.label_112 = QLabel(self.frame_58)
         self.label_112.setObjectName(u"label_112")
 
         self.gridLayout.addWidget(self.label_112, 8, 0, 1, 1)
 
-        self.label_43 = QLabel(self.frame_58)
-        self.label_43.setObjectName(u"label_43")
+        self.label_15 = QLabel(self.frame_58)
+        self.label_15.setObjectName(u"label_15")
 
-        self.gridLayout.addWidget(self.label_43, 2, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_15, 13, 0, 1, 1)
 
-        self.branch_width_based_on_flow_checkBox = QCheckBox(self.frame_58)
-        self.branch_width_based_on_flow_checkBox.setObjectName(u"branch_width_based_on_flow_checkBox")
-        self.branch_width_based_on_flow_checkBox.setChecked(False)
+        self.label_113 = QLabel(self.frame_58)
+        self.label_113.setObjectName(u"label_113")
 
-        self.gridLayout.addWidget(self.branch_width_based_on_flow_checkBox, 13, 0, 1, 2)
+        self.gridLayout.addWidget(self.label_113, 4, 0, 1, 1)
+
+        self.palette_comboBox = QComboBox(self.frame_58)
+        self.palette_comboBox.setObjectName(u"palette_comboBox")
+
+        self.gridLayout.addWidget(self.palette_comboBox, 3, 0, 1, 2)
 
         self.label_9 = QLabel(self.frame_58)
         self.label_9.setObjectName(u"label_9")
@@ -3612,18 +3610,6 @@ class Ui_mainWindow(object):
 
         self.gridLayout.addWidget(self.frame_74, 0, 0, 1, 1)
 
-        self.label_15 = QLabel(self.frame_58)
-        self.label_15.setObjectName(u"label_15")
-
-        self.gridLayout.addWidget(self.label_15, 12, 0, 1, 1)
-
-        self.min_branch_size_spinBox = QSpinBox(self.frame_58)
-        self.min_branch_size_spinBox.setObjectName(u"min_branch_size_spinBox")
-        self.min_branch_size_spinBox.setMinimum(5)
-        self.min_branch_size_spinBox.setMaximum(10000)
-
-        self.gridLayout.addWidget(self.min_branch_size_spinBox, 11, 1, 1, 1)
-
         self.label_54 = QLabel(self.frame_58)
         self.label_54.setObjectName(u"label_54")
         palette39 = QPalette()
@@ -3636,36 +3622,54 @@ class Ui_mainWindow(object):
 
         self.gridLayout.addWidget(self.label_54, 9, 0, 1, 1)
 
-        self.min_node_size_spinBox = QSpinBox(self.frame_58)
-        self.min_node_size_spinBox.setObjectName(u"min_node_size_spinBox")
-        self.min_node_size_spinBox.setMinimum(20)
-        self.min_node_size_spinBox.setMaximum(10000)
+        self.branch_width_based_on_flow_checkBox = QCheckBox(self.frame_58)
+        self.branch_width_based_on_flow_checkBox.setObjectName(u"branch_width_based_on_flow_checkBox")
+        self.branch_width_based_on_flow_checkBox.setChecked(False)
 
-        self.gridLayout.addWidget(self.min_node_size_spinBox, 6, 1, 1, 1)
+        self.gridLayout.addWidget(self.branch_width_based_on_flow_checkBox, 14, 0, 1, 2)
 
         self.label = QLabel(self.frame_58)
         self.label.setObjectName(u"label")
 
         self.gridLayout.addWidget(self.label, 6, 0, 1, 1)
 
-        self.palette_comboBox = QComboBox(self.frame_58)
-        self.palette_comboBox.setObjectName(u"palette_comboBox")
+        self.verticalSpacer_4 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
-        self.gridLayout.addWidget(self.palette_comboBox, 3, 0, 1, 2)
+        self.gridLayout.addItem(self.verticalSpacer_4, 15, 0, 1, 1)
 
-        self.verticalSpacer_4 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        self.min_branch_size_spinBox = QDoubleSpinBox(self.frame_58)
+        self.min_branch_size_spinBox.setObjectName(u"min_branch_size_spinBox")
+        self.min_branch_size_spinBox.setDecimals(1)
+        self.min_branch_size_spinBox.setSingleStep(0.100000000000000)
+        self.min_branch_size_spinBox.setValue(0.500000000000000)
 
-        self.gridLayout.addItem(self.verticalSpacer_4, 14, 0, 1, 1)
+        self.gridLayout.addWidget(self.min_branch_size_spinBox, 11, 1, 1, 1)
 
-        self.label_113 = QLabel(self.frame_58)
-        self.label_113.setObjectName(u"label_113")
+        self.max_branch_size_spinBox = QDoubleSpinBox(self.frame_58)
+        self.max_branch_size_spinBox.setObjectName(u"max_branch_size_spinBox")
+        self.max_branch_size_spinBox.setDecimals(1)
+        self.max_branch_size_spinBox.setSingleStep(0.100000000000000)
+        self.max_branch_size_spinBox.setValue(20.000000000000000)
 
-        self.gridLayout.addWidget(self.label_113, 4, 0, 1, 1)
+        self.gridLayout.addWidget(self.max_branch_size_spinBox, 13, 1, 1, 1)
 
-        self.label_14 = QLabel(self.frame_58)
-        self.label_14.setObjectName(u"label_14")
+        self.min_node_size_spinBox = QDoubleSpinBox(self.frame_58)
+        self.min_node_size_spinBox.setObjectName(u"min_node_size_spinBox")
+        self.min_node_size_spinBox.setDecimals(1)
+        self.min_node_size_spinBox.setMinimum(0.100000000000000)
+        self.min_node_size_spinBox.setSingleStep(0.100000000000000)
+        self.min_node_size_spinBox.setValue(20.000000000000000)
 
-        self.gridLayout.addWidget(self.label_14, 11, 0, 1, 1)
+        self.gridLayout.addWidget(self.min_node_size_spinBox, 6, 1, 1, 1)
+
+        self.max_node_size_spinBox = QDoubleSpinBox(self.frame_58)
+        self.max_node_size_spinBox.setObjectName(u"max_node_size_spinBox")
+        self.max_node_size_spinBox.setDecimals(1)
+        self.max_node_size_spinBox.setMinimum(0.100000000000000)
+        self.max_node_size_spinBox.setSingleStep(0.100000000000000)
+        self.max_node_size_spinBox.setValue(40.000000000000000)
+
+        self.gridLayout.addWidget(self.max_node_size_spinBox, 7, 1, 1, 1)
 
 
         self.horizontalLayout_39.addWidget(self.frame_58)
@@ -4764,7 +4768,7 @@ class Ui_mainWindow(object):
 #endif // QT_CONFIG(tooltip)
         self.delete_selected_objects_pushButton.setText("")
         self.tabWidget_5.setTabText(self.tabWidget_5.indexOf(self.tab_15), QCoreApplication.translate("mainWindow", u"Objects", None))
-        self.association_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
+        self.association_units_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
         self.tabWidget_5.setTabText(self.tabWidget_5.indexOf(self.tab_2), QCoreApplication.translate("mainWindow", u"Associations", None))
 #if QT_CONFIG(tooltip)
         self.device_type_magnitude_comboBox.setToolTip(QCoreApplication.translate("mainWindow", u"Magnitude with profile", None))
@@ -5372,18 +5376,18 @@ class Ui_mainWindow(object):
 #endif // QT_CONFIG(tooltip)
         self.label_76.setText("")
         self.label_49.setText(QCoreApplication.translate("mainWindow", u"Draw", None))
+        self.label_14.setText(QCoreApplication.translate("mainWindow", u"Min. size", None))
         self.label_56.setText(QCoreApplication.translate("mainWindow", u"Nodes", None))
-        self.label_112.setText("")
         self.label_43.setText(QCoreApplication.translate("mainWindow", u"Palette", None))
-        self.branch_width_based_on_flow_checkBox.setText(QCoreApplication.translate("mainWindow", u"Width based on flow", None))
+        self.label_112.setText("")
+        self.label_15.setText(QCoreApplication.translate("mainWindow", u"Max. size", None))
+        self.label_113.setText("")
         self.label_9.setText(QCoreApplication.translate("mainWindow", u"Max. size", None))
         self.label_110.setText("")
         self.label_111.setText(QCoreApplication.translate("mainWindow", u"Schematic", None))
-        self.label_15.setText(QCoreApplication.translate("mainWindow", u"Max. size", None))
         self.label_54.setText(QCoreApplication.translate("mainWindow", u"Branches", None))
+        self.branch_width_based_on_flow_checkBox.setText(QCoreApplication.translate("mainWindow", u"Width based on flow", None))
         self.label.setText(QCoreApplication.translate("mainWindow", u"Min. size", None))
-        self.label_113.setText("")
-        self.label_14.setText(QCoreApplication.translate("mainWindow", u"Min. size", None))
         self.label_114.setText("")
         self.label_99.setText("")
         self.label_100.setText(QCoreApplication.translate("mainWindow", u"Map", None))

{GridCal-5.1.17 → GridCal-5.1.19}/GridCal/Gui/Main/SubClasses/Model/diagrams.py

@@ -166,6 +166,14 @@ class DiagramsMain(CompiledArraysMain):
         self.ui.explosion_factor_doubleSpinBox.valueChanged.connect(self.explosion_factor_change)
         self.ui.defaultBusVoltageSpinBox.valueChanged.connect(self.default_voltage_change)
 
+        self.ui.min_branch_size_spinBox.valueChanged.connect(self.set_diagrams_size_contraints)
+        self.ui.max_branch_size_spinBox.valueChanged.connect(self.set_diagrams_size_contraints)
+        self.ui.min_node_size_spinBox.valueChanged.connect(self.set_diagrams_size_contraints)
+        self.ui.max_node_size_spinBox.valueChanged.connect(self.set_diagrams_size_contraints)
+
+        # check boxes
+        self.ui.branch_width_based_on_flow_checkBox.clicked.connect(self.set_diagrams_size_contraints)
+
         # context menu
         self.ui.diagramsListView.customContextMenuRequested.connect(self.show_diagrams_context_menu)
 
@@ -884,6 +892,11 @@ class DiagramsMain(CompiledArraysMain):
                                          default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                          time_index=self.get_diagram_slider_index(),
                                          prefer_node_breaker=prefer_node_breaker,
+                                         use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                                         min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                                         max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                                         min_bus_width=self.ui.min_node_size_spinBox.value(),
+                                         max_bus_width=self.ui.max_node_size_spinBox.value(),
                                          call_delete_db_element_func=self.call_delete_db_element)
 
         diagram_widget.setStretchFactor(1, 10)
@@ -921,6 +934,11 @@ class DiagramsMain(CompiledArraysMain):
                                                  diagram=diagram,
                                                  default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                                  time_index=self.get_diagram_slider_index(),
+                                                 use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                                                 min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                                                 max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                                                 min_bus_width=self.ui.min_node_size_spinBox.value(),
+                                                 max_bus_width=self.ui.max_node_size_spinBox.value(),
                                                  call_delete_db_element_func=self.call_delete_db_element)
 
                 self.add_diagram_widget_and_diagram(diagram_widget=diagram_widget, diagram=diagram)
@@ -994,12 +1012,48 @@ class DiagramsMain(CompiledArraysMain):
                                                              diagram=diagram,
                                                              default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                                              time_index=self.get_diagram_slider_index(),
+                                                             use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                                                             min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                                                             max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                                                             min_bus_width=self.ui.min_node_size_spinBox.value(),
+                                                             max_bus_width=self.ui.max_node_size_spinBox.value(),
                                                              call_delete_db_element_func=self.call_delete_db_element)
 
                             self.add_diagram_widget_and_diagram(diagram_widget=diagram_widget,
                                                                 diagram=diagram)
                             self.set_diagrams_list_view()
 
+    def new_bus_branch_diagram_from_substation(self, substation: dev.Substation):
+        """
+        Add a bus-branch diagram of a particular selection of objects
+        """
+
+        buses = self.circuit.get_substation_buses(substation=substation)
+
+        if len(buses):
+            diagram = make_vecinity_diagram(circuit=self.circuit,
+                                            root_bus=buses[0],
+                                            max_level=2,
+                                            prog_func=None,
+                                            text_func=None)
+
+            diagram_widget = SchematicWidget(self.circuit,
+                                             diagram=diagram,
+                                             default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
+                                             time_index=self.get_diagram_slider_index(),
+                                             use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                                             min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                                             max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                                             min_bus_width=self.ui.min_node_size_spinBox.value(),
+                                             max_bus_width=self.ui.max_node_size_spinBox.value(),
+                                             call_delete_db_element_func=self.call_delete_db_element)
+
+            self.add_diagram_widget_and_diagram(diagram_widget=diagram_widget, diagram=diagram)
+            self.set_diagrams_list_view()
+        else:
+            info_msg(text=f"No buses were found associated with the substation {substation.name}",
+                     title="New schematic from substation")
+
     def create_circuit_stored_diagrams(self):
         """
         Create as Widgets the diagrams stored in the circuit
@@ -1015,6 +1069,11 @@ class DiagramsMain(CompiledArraysMain):
                                                  diagram=diagram,
                                                  default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                                  time_index=self.get_diagram_slider_index(),
+                                                 use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                                                 min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                                                 max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                                                 min_bus_width=self.ui.min_node_size_spinBox.value(),
+                                                 max_bus_width=self.ui.max_node_size_spinBox.value(),
                                                  call_delete_db_element_func=self.call_delete_db_element)
 
                 diagram_widget.setStretchFactor(1, 10)
@@ -1027,13 +1086,22 @@ class DiagramsMain(CompiledArraysMain):
                 tile_source = self.tile_sources.get(diagram.tile_source, defualt_tile_source)
 
                 # create the map widget
-                map_widget = GridMapWidget(tile_src=tile_source,
-                                           start_level=diagram.start_level,
-                                           longitude=diagram.longitude,
-                                           latitude=diagram.latitude,
-                                           name=diagram.name,
-                                           circuit=self.circuit,
-                                           diagram=diagram)
+                map_widget = GridMapWidget(
+                    tile_src=tile_source,
+                    start_level=diagram.start_level,
+                    longitude=diagram.longitude,
+                    latitude=diagram.latitude,
+                    name=diagram.name,
+                    circuit=self.circuit,
+                    diagram=diagram,
+                    use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                    min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                    max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                    min_bus_width=self.ui.min_node_size_spinBox.value(),
+                    max_bus_width=self.ui.max_node_size_spinBox.value(),
+                    call_delete_db_element_func=self.call_delete_db_element,
+                    call_new_substation_diagram_func=self.new_bus_branch_diagram_from_substation
+                )
 
                 # map_widget.GotoLevelAndPosition(5, -15.41, 40.11)
                 self.diagram_widgets_list.append(map_widget)
@@ -1076,7 +1144,13 @@ class DiagramsMain(CompiledArraysMain):
                                    name=diagram.name,
                                    circuit=self.circuit,
                                    diagram=diagram,
-                                   call_delete_db_element_func=self.call_delete_db_element)
+                                   use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                                   min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                                   max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                                   min_bus_width=self.ui.min_node_size_spinBox.value(),
+                                   max_bus_width=self.ui.max_node_size_spinBox.value(),
+                                   call_delete_db_element_func=self.call_delete_db_element,
+                                   call_new_substation_diagram_func=self.new_bus_branch_diagram_from_substation)
 
         self.add_diagram_widget_and_diagram(diagram_widget=map_widget, diagram=diagram)
         self.set_diagrams_list_view()
@@ -1699,3 +1773,16 @@ class DiagramsMain(CompiledArraysMain):
             self.circuit.delete_element(obj=api_obj)
         except ValueError as e:
             print(e)
+
+    def set_diagrams_size_contraints(self):
+        """
+        Set the size constraints
+        """
+        for diagram_widget in self.diagram_widgets_list:
+            diagram_widget.set_size_constraints(
+                use_flow_based_width=self.ui.branch_width_based_on_flow_checkBox.isChecked(),
+                min_branch_width=self.ui.min_branch_size_spinBox.value(),
+                max_branch_width=self.ui.max_branch_size_spinBox.value(),
+                min_bus_width=self.ui.min_node_size_spinBox.value(),
+                max_bus_width=self.ui.max_node_size_spinBox.value()
+            )