GridCal 5.1.39__tar.gz → 5.1.41__tar.gz

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -72,9 +72,9 @@ class MapLineContainer(GenericDiagramWidget):
         :param val:
         """
         for segment in self.segments_list:
-            pen = segment.pen()  # get the current pen
-            pen.setWidthF(val * segment.width)  # Set the fractional thickness of the line
-            segment.setPen(pen)  # Assign the pen to the line item
+            # pen = segment.pen()  # get the current pen
+            # pen.setWidthF(val * segment.width)  # Set the fractional thickness of the line
+            segment.set_width(val * segment.width)  # Assign the pen to the line item
 
     def clean_segments(self) -> None:
         """
@@ -132,10 +132,8 @@ class MapLineContainer(GenericDiagramWidget):
         :return:
         """
         for segment in self.segments_list:
-            segment.setPen(QPen(color, w, style))
             segment.setToolTip(tool_tip)
-            # segment.setPen(Qt.NoPen)
-            # segment.setBrush(color)
+            segment.set_colour(color=color, w=w, style=style)
 
     def update_connectors(self) -> None:
         """
@@ -463,3 +461,23 @@ class MapLineContainer(GenericDiagramWidget):
 
         for line in self.segments_list:
             line.set_enable(val=False)
+
+    def set_arrows_with_power(self, Sf: complex, St: complex) -> None:
+        """
+
+        :param Sf:
+        :param St:
+        :return:
+        """
+        for segment in self.segments_list:
+            segment.set_arrows_with_power(Sf=Sf, St=St)
+
+    def set_arrows_with_hvdc_power(self, Pf: float, Pt: float) -> None:
+        """
+
+        :param Pf:
+        :param Pt:
+        :return:
+        """
+        for segment in self.segments_list:
+            segment.set_arrows_with_hvdc_power(Pf=Pf, Pt=Pt)

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -21,6 +21,7 @@ from PySide6.QtGui import QPen, QColor, QCursor
 from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent
 from PySide6.QtWidgets import QGraphicsLineItem, QGraphicsSceneMouseEvent
 
+from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_graphics_template import ArrowHead
 from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER
@@ -59,6 +60,19 @@ class MapLineSegment(QGraphicsLineItem):
         self.pos1: QPointF = self.first.get_center_pos()
         self.pos2: QPointF = self.second.get_center_pos()
 
+        # arrows
+        self.view_arrows = True
+        self._arrow_size = self.width * 1.5
+        self.arrow_p_from = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.2, under=False,
+                                      text_scale=0.01, show_text=False)
+        self.arrow_q_from = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.2, under=True,
+                                      text_scale=0.01, show_text=False)
+        self.arrow_p_to = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.8, under=False,
+                                    text_scale=0.01, show_text=False)
+        self.arrow_q_to = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.8, under=True,
+                                    text_scale=0.01, show_text=False)
+
+        # set callbacks
         self.first.add_position_change_callback(self.set_from_side_coordinates)
         self.second.add_position_change_callback(self.set_to_side_coordinates)
 
@@ -68,7 +82,7 @@ class MapLineSegment(QGraphicsLineItem):
         self.setZValue(0)
 
         self.setFlag(self.GraphicsItemFlag.ItemIsSelectable, True)
-        self.setCursor(QCursor(Qt.PointingHandCursor))
+        self.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
     @property
     def api_object(self) -> BRANCH_TYPES:
@@ -86,6 +100,21 @@ class MapLineSegment(QGraphicsLineItem):
         """
         return self.container.editor
 
+    def set_width(self, width: float):
+        """
+
+        :param width:
+        :return:
+        """
+        pen = self.pen()
+        pen.setWidthF(width)
+        self.setPen(pen)
+
+        self.arrow_p_from.label.setScale(width)
+        self.arrow_q_from.label.setScale(width)
+        self.arrow_p_to.label.setScale(width)
+        self.arrow_q_to.label.setScale(width)
+
     def set_colour(self, color: QColor, w: float, style: Qt.PenStyle):
         """
         Set color and style
@@ -95,10 +124,14 @@ class MapLineSegment(QGraphicsLineItem):
         :return:
         """
 
-        pen = QPen(color, w, style, Qt.RoundCap, Qt.RoundJoin)
+        pen = QPen(color, w, style, Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin)
         pen.setWidthF(w)
 
         self.setPen(pen)
+        self.arrow_p_from.set_colour(color, w, style)
+        self.arrow_q_from.set_colour(color, w, style)
+        self.arrow_p_to.set_colour(color, w, style)
+        self.arrow_q_to.set_colour(color, w, style)
 
     def set_from_side_coordinates(self, x: float, y: float):
         """
@@ -125,13 +158,15 @@ class MapLineSegment(QGraphicsLineItem):
         Update the endings of this segment
         """
         self.setLine(QLineF(self.pos1, self.pos2))
-        # Get the positions of the first and second objects
-        # if self.first.needsUpdate or self.second.needsUpdate or force:
-        #     # Set the line's starting and ending points
-        #     self.setLine(self.first.rect().x(),
-        #                  self.first.rect().y(),
-        #                  self.second.rect().x(),
-        #                  self.second.rect().y())
+
+        if self.api_object is not None:
+
+            # arrows
+            if self.view_arrows:
+                self.arrow_p_from.redraw()
+                self.arrow_q_from.redraw()
+                self.arrow_p_to.redraw()
+                self.arrow_q_to.redraw()
 
     def end_update(self) -> None:
         """
@@ -158,11 +193,6 @@ class MapLineSegment(QGraphicsLineItem):
         """
         menu = QMenu()
 
-        # add_menu_entry(menu=menu,
-        #                text="Remove",
-        #                icon_path="",
-        #                function_ptr=self.RemoveFunction)
-
         menu.addSection("Line")
 
         add_menu_entry(menu=menu,
@@ -360,3 +390,34 @@ class MapLineSegment(QGraphicsLineItem):
         if ok:
             self.editor.circuit.delete_branch(obj=self.api_object)
             self.editor.delete_diagram_element(device=self.api_object)
+
+    def set_arrows_with_power(self, Sf: complex, St: complex) -> None:
+        """
+        Set the arrow directions
+        :param Sf: Complex power from
+        :param St: Complex power to
+        """
+
+        if Sf is not None:
+            if St is None:
+                St = -Sf
+
+            Pf = Sf.real
+            Qf = Sf.imag
+            Pt = St.real
+            Qt_ = St.imag
+            self.arrow_p_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+            self.arrow_q_from.set_value(Qf, True, Qf < 0, name="Qf", units="MVAr", draw_label=self.draw_labels)
+            self.arrow_p_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+            self.arrow_q_to.set_value(Qt_, True, Qt_ > 0, name="Qt", units="MVAr", draw_label=self.draw_labels)
+
+    def set_arrows_with_hvdc_power(self, Pf: float, Pt: float) -> None:
+        """
+        Set the arrow directions
+        :param Pf: Complex power from
+        :param Pt: Complex power to
+        """
+        self.arrow_p_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_q_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_p_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+        self.arrow_q_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -245,7 +245,7 @@ class GridMapWidget(BaseDiagramWidget):
                              position_callback=self.position_callback)
 
         # Any representation on the map must be done after this Goto Function
-        self.map.GotoLevelAndPosition(level=6, longitude=0, latitude=40)
+        self.map.GotoLevelAndPosition(level=6, longitude=longitude, latitude=latitude)
 
         self.map.startLev = 6
         self.map.startLat = 0
@@ -1059,7 +1059,7 @@ class GridMapWidget(BaseDiagramWidget):
                         a *= 255
 
                     color = QColor(r, g, b, a)
-                    style = Qt.SolidLine
+                    style = Qt.PenStyle.SolidLine
                     if use_flow_based_width:
                         weight = int(
                             np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
@@ -1068,6 +1068,15 @@ class GridMapWidget(BaseDiagramWidget):
 
                     graphic_object.set_colour(color=color, w=weight, style=style, tool_tip=tooltip)
 
+                    if hasattr(graphic_object, 'set_arrows_with_power'):
+                        graphic_object.set_arrows_with_power(
+                            Sf=Sf[i] if Sf is not None else None,
+                            St=St[i] if St is not None else None
+                        )
+                else:
+                    # the graphic object is None
+                    pass
+
         # try colouring the HVDC lines
         if len(hvdc_lines) > 0:
 
@@ -1110,13 +1119,26 @@ class GridMapWidget(BaseDiagramWidget):
                         a *= 255
 
                     color = QColor(r, g, b, a)
-                    style = Qt.SolidLine
+                    style = Qt.PenStyle.SolidLine
                     if use_flow_based_width:
                         weight = int(
                             np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
                     else:
                         weight = 0.5
 
+                    tooltip = str(i) + ': ' + graphic_object.api_object.name
+                    tooltip += '\n' + loading_label + ': ' + "{:10.4f}".format(
+                        abs(hvdc_loading[i]) * 100) + ' [%]'
+
+                    tooltip += '\nPower (from):\t' + "{:10.4f}".format(hvdc_Pf[i]) + ' [MW]'
+
+                    if hvdc_losses is not None:
+                        tooltip += '\nPower (to):\t' + "{:10.4f}".format(hvdc_Pt[i]) + ' [MW]'
+                        tooltip += '\nLosses: \t\t' + "{:10.4f}".format(hvdc_losses[i]) + ' [MW]'
+                        graphic_object.set_arrows_with_hvdc_power(Pf=hvdc_Pf[i], Pt=hvdc_Pt[i])
+                    else:
+                        graphic_object.set_arrows_with_hvdc_power(Pf=hvdc_Pf[i], Pt=-hvdc_Pf[i])
+
                     graphic_object.set_colour(color=color, w=weight, style=style, tool_tip=tooltip)
 
     def get_image(self, transparent: bool = False) -> Tuple[QImage, int, int]:

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_graphics_template.py

@@ -329,12 +329,13 @@ class ArrowHead(QGraphicsPolygonItem):
 
     def __init__(self,
                  parent: QGraphicsLineItem,
-                 arrow_size: int,
+                 arrow_size: float,
                  position: float = 0.9,
                  under: bool = False,
                  backwards: bool = False,
                  separation: int = 5,
-                 show_text: bool = True):
+                 show_text: bool = True,
+                 text_scale: float = 1.0):
         """
         Constructor
         :param parent: Parent line
@@ -344,11 +345,12 @@ class ArrowHead(QGraphicsPolygonItem):
         :param backwards: Is it backwards?
         :param separation: Separation
         :param show_text: Show the label?
+        :param text_scale: Text scale
         """
         QGraphicsPolygonItem.__init__(self, parent=parent)
 
         self.parent: QGraphicsLineItem = parent
-        self.arrow_size: int = arrow_size
+        self.arrow_size: float = arrow_size
         self.position: float = position
         self.under: bool = under
         self.backwards: float = backwards
@@ -356,6 +358,7 @@ class ArrowHead(QGraphicsPolygonItem):
 
         self.label = QGraphicsTextItem(self)
         self.label.setPlainText("")
+        # self.label.setScale(text_scale)
         self.show_text = show_text
 
         self.w = arrow_size
@@ -373,6 +376,7 @@ class ArrowHead(QGraphicsPolygonItem):
         """
         self.setBrush(color)
         self.label.setDefaultTextColor(color)
+        # self.label.setScale(w)
 
     def set_value(self, value: float, redraw=True, backwards=False, name="", units="", format_str="{:10.2f}",
                   draw_label: bool = True, visibility_filter_value=1e-4):

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -3469,7 +3469,8 @@ class SchematicWidget(BaseDiagramWidget):
                                 if hasattr(graphic_object, 'set_arrows_with_power'):
                                     graphic_object.set_arrows_with_power(
                                         Sf=Sf[i] if Sf is not None else None,
-                                        St=St[i] if St is not None else None)
+                                        St=St[i] if St is not None else None
+                                    )
                             else:
                                 w = graphic_object.pen_width
                                 style = Qt.PenStyle.DashLine

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/Main/SubClasses/Model/time_events.py

@@ -27,7 +27,7 @@ from GridCal.Gui.general_dialogues import NewProfilesStructureDialogue, TimeReIn
 from GridCal.Gui.messages import yes_no_question, warning_msg, info_msg
 from GridCal.Gui.Main.SubClasses.Model.objects import ObjectsTableMain
 from GridCal.Gui.ProfilesInput.models_dialogue import ModelsInputGUI
-from GridCal.Gui.ProfilesInput.profile_dialogue import ProfileInputGUI
+from GridCal.Gui.ProfilesInput.profile_dialogue import ProfileInputGUI, GeneratorsProfileOptionsDialogue
 from GridCal.Gui.profiles_model import ProfilesModel
 
 
@@ -85,7 +85,6 @@ class TimeEventsMain(ObjectsTableMain):
         """
         dlg = NewProfilesStructureDialogue()
         if dlg.exec_():
-
             steps, step_length, step_unit, time_base = dlg.get_values()
 
             self.ui.profiles_tableView.setModel(None)
@@ -180,18 +179,26 @@ class TimeEventsMain(ObjectsTableMain):
                     if len(objects) > 0:
                         if magnitude == 'P':
                             if objects[0].device_type == DeviceType.GeneratorDevice:
-                                ok = yes_no_question(
-                                    "Do you want to correct the generators active "
-                                    "profile based on the active power profile?",
-                                    "Match")
-                                if ok:
+
+                                dlg = GeneratorsProfileOptionsDialogue()
+                                dlg.exec()
+
+                                if dlg.correct_active_profile.isChecked():
                                     self.fix_generators_active_based_on_the_power(ask_before=False)
+
+                                if dlg.set_non_dispatchable.isChecked():
+                                    for i, elm in enumerate(objects):
+                                        if self.profile_input_dialogue.has_profile(i):
+                                            # if there was a profile, we want the generator not dispatchable
+                                            elm.enabled_dispatch = False
+                                        else:
+                                            elm.enabled_dispatch = True
+
                             elif objects[0].device_type == DeviceType.LoadDevice:
-                                ok = yes_no_question(
-                                    "Do you want to correct the loads active profile "
-                                    "based on the active power profile?",
-                                    "Match")
-                                if ok:
+                                ok1 = yes_no_question("Do you want to correct the loads active profile "
+                                                      "based on the active power profile?",
+                                                      "Match")
+                                if ok1:
                                     self.fix_loads_active_based_on_the_power(ask_before=False)
 
                 else:

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/ProfilesInput/profile_dialogue.py

@@ -19,14 +19,13 @@ from __future__ import annotations
 import os
 import string
 import sys
-from typing import Union
+from typing import Tuple, List
 from random import randint
 from enum import Enum
 from difflib import SequenceMatcher
 import numpy as np
 import pandas as pd
 from PySide6 import QtWidgets, QtCore
-from typing import List
 from GridCal.Gui.pandas_model import PandasModel
 from GridCal.Gui.gui_functions import get_list_model
 from GridCal.Gui.ProfilesInput.profiles_from_data_gui import Ui_Dialog
@@ -34,6 +33,7 @@ from GridCal.Gui.ProfilesInput.excel_dialog import ExcelDialog
 from GridCal.Gui.messages import error_msg
 from GridCalEngine.Devices.types import ALL_DEV_TYPES
 from GridCalEngine.Devices.Parents.editable_device import uuid2idtag
+from GridCalEngine.basic_structures import Mat, BoolVec
 
 
 class MultiplierType(Enum):
@@ -127,16 +127,16 @@ class ProfileAssociations(QtCore.QAbstractTableModel):
         """
         self.__values.append(val)
 
-    def set_profile_at(self, idx, value):
+    def set_profile_at(self, idx: int, profile_name: str) -> None:
         """
 
         :param idx:
-        :param value:
+        :param profile_name:
         :return:
         """
-        self.__values[idx].profile_name = value
+        self.__values[idx].profile_name = profile_name
 
-    def set_scale_at(self, idx, value):
+    def set_scale_at(self, idx: int, value: float) -> None:
         """
 
         :param idx:
@@ -145,7 +145,7 @@ class ProfileAssociations(QtCore.QAbstractTableModel):
         """
         self.__values[idx].scale = value
 
-    def set_multiplier_at(self, idx, value):
+    def set_multiplier_at(self, idx: int, value: float) -> None:
         """
 
         :param idx:
@@ -154,7 +154,7 @@ class ProfileAssociations(QtCore.QAbstractTableModel):
         """
         self.__values[idx].multiplier = value
 
-    def get_profile_at(self, idx):
+    def get_profile_at(self, idx: int) -> str:
         """
 
         :param idx:
@@ -162,7 +162,7 @@ class ProfileAssociations(QtCore.QAbstractTableModel):
         """
         return self.__values[idx].profile_name
 
-    def get_scale_at(self, idx):
+    def get_scale_at(self, idx: int) -> float:
         """
 
         :param idx:
@@ -170,7 +170,7 @@ class ProfileAssociations(QtCore.QAbstractTableModel):
         """
         return self.__values[idx].scale
 
-    def get_multiplier_at(self, idx):
+    def get_multiplier_at(self, idx: int) -> float:
         """
 
         :param idx:
@@ -188,7 +188,7 @@ class ProfileAssociations(QtCore.QAbstractTableModel):
         self.__values[idx].scale = 1
         self.__values[idx].multiplier = 1
 
-    def rowCount(self, parent=None):
+    def rowCount(self, parent: QtCore.QModelIndex = None) -> int:
         """
 
         :param parent:
@@ -292,20 +292,36 @@ def check_similarity(name_to_search: str,
         return None
 
 
-# def msg(text: str, title="Warning"):
-#     """
-#     Message box
-#     :param text: Text to display
-#     :param title: Name of the window
-#     """
-#     msg = QtWidgets.QMessageBox()
-#     msg.setIcon(QtWidgets.QMessageBox.Icon.Information)
-#     msg.setText(text)
-#     # msg.setInformativeText("This is additional information")
-#     msg.setWindowTitle(title)
-#     # msg.setDetailedText("The details are as follows:")
-#     msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok)
-#     retval = msg.exec_()
+class GeneratorsProfileOptionsDialogue(QtWidgets.QDialog):
+    """
+    Dialogue to show after profile import
+    """
+
+    def __init__(self):
+        super().__init__()
+
+        self.setWindowTitle("Generator active power options")
+        self.setModal(True)  # Make the dialog modal
+
+        # Create checkboxes
+        self.correct_active_profile = QtWidgets.QCheckBox("Correct active profile")
+        self.correct_active_profile.setToolTip("The generators active will be set to False if the power is zero")
+
+        self.set_non_dispatchable = QtWidgets.QCheckBox("Set to non-dispatchable")
+        self.set_non_dispatchable.setToolTip("Teh generators matched will be set set to non dispatchable. "
+                                             "This is usefull to specify renewable generation")
+
+        # Create layout and add checkboxes
+        layout = QtWidgets.QVBoxLayout()
+        layout.addWidget(self.correct_active_profile)
+        layout.addWidget(self.set_non_dispatchable)
+
+        # Create OK button to close the dialog
+        ok_button = QtWidgets.QPushButton("OK")
+        ok_button.clicked.connect(self.accept)  # Close modal on button click
+        layout.addWidget(ok_button)
+
+        self.setLayout(layout)
 
 
 class ProfileInputGUI(QtWidgets.QDialog):
@@ -332,15 +348,15 @@ class ProfileInputGUI(QtWidgets.QDialog):
         self.ui.setupUi(self)
         self.setWindowTitle('Profiles import dialogue')
 
-        self.project_directory = None
+        self.project_directory: str | None = None
 
         self.magnitudes = magnitudes
 
         # results
-        self.data = None
-        self.time = None
-        self.zeroed = None
-        self.normalized = False
+        self.data: Mat | None = None
+        self.time: pd.DatetimeIndex | None = None
+        self.zeroed: BoolVec = None  # array to know which profiles are only zeros
+        self.normalized: bool = False
 
         # units
         self.units = dict()
@@ -394,13 +410,13 @@ class ProfileInputGUI(QtWidgets.QDialog):
         }
         self.ui.nameTransformationComboBox.setModel(get_list_model(list(self.transformations.keys())))
 
-        self.original_data_frame = None
+        self.original_data_frame: pd.DataFrame | None = None
 
         self.ui.autolink_slider.setValue(100)  # Set slider to max value
 
         self.profile_names = list()
 
-        self.excel_dialogue: Union[ExcelDialog, None] = None
+        self.excel_dialogue: ExcelDialog | None = None
 
         # click
         self.ui.open_button.clicked.connect(self.import_profile)
@@ -418,7 +434,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
         self.ui.assignation_table.doubleClicked.connect(self.assignation_table_double_click)
         self.ui.tableView.doubleClicked.connect(self.print_profile)
 
-    def get_multiplier(self):
+    def get_multiplier(self) -> float:
         """
         Gets the necessary multiplier to pass the profile units to Mega
         Remember that the power units in GridCal are the MVA
@@ -426,7 +442,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
         unit = self.ui.units_combobox.currentText()
         return self.units[unit] / self.units['M']
 
-    def import_profile(self):
+    def import_profile(self) -> None:
         """
         Select a file to be loaded
         """
@@ -525,7 +541,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
             self.original_data_frame[col_name].plot(ax=self.ui.plotwidget.canvas.ax)
             self.ui.plotwidget.canvas.draw()
 
-    def display_associations(self):
+    def display_associations(self) -> None:
         """
 
         @return:
@@ -533,7 +549,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
         self.ui.assignation_table.setModel(self.associations)
         self.ui.assignation_table.repaint()
 
-    def display_profiles(self):
+    def display_profiles(self) -> None:
         """
 
         :return:
@@ -556,7 +572,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
                 self.original_data_frame[name].plot(ax=self.ui.plotwidget.canvas.ax)
                 self.ui.plotwidget.canvas.draw()
 
-    def make_association(self, source_idx, obj_idx, scale=None, mult=None, col_idx=None):
+    def make_association(self, source_idx: int, obj_idx: int, scale: float = 1.0, mult: float = 1.0) -> None:
         """
         Makes an association in the associations table
         """
@@ -579,7 +595,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
             idx_o = self.ui.assignation_table.selectedIndexes()[0].row()
             col = self.ui.assignation_table.selectedIndexes()[0].column()
 
-            self.make_association(idx_s, idx_o, mult=None, col_idx=col)
+            self.make_association(idx_s, idx_o, mult=1.0)
 
     def set_multiplier(self, tpe):
         """
@@ -623,7 +639,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
             # assign the string with the closest match profile
             if idx is not None:
                 # make the association
-                self.make_association(idx, idx_o, mult)
+                self.make_association(idx, idx_o, 1.0, mult)
 
         self.display_associations()
 
@@ -705,7 +721,7 @@ class ProfileInputGUI(QtWidgets.QDialog):
 
             self.display_associations()
 
-    def get_profile(self, parent=None, labels=None, alsoQ=None):
+    def get_profiles_data(self) -> Tuple[Mat | None, pd.DatetimeIndex | None, BoolVec | None]:
         """
         Return ths assigned profiles
         @return:
@@ -795,13 +811,21 @@ class ProfileInputGUI(QtWidgets.QDialog):
                 self.original_data_frame.columns = self.profile_names
                 self.display_profiles()
 
-    def do_it(self):
+    def has_profile(self, i: int) -> bool:
+        """
+        Return if an object index has an associated profile
+        :param i:
+        :return:
+        """
+        return self.associations.get_profile_at(i) != ""
+
+    def do_it(self) -> None:
         """
         Close. The data has to be queried later to the object by the parent by calling get_association_data
         """
 
         # Generate profiles
-        self.data, self.time, self.zeroed = self.get_profile()
+        self.data, self.time, self.zeroed = self.get_profiles_data()
         self.normalized = self.ui.normalized_checkBox.isChecked()
 
         if self.normalized:
@@ -814,13 +838,13 @@ class ProfileInputGUI(QtWidgets.QDialog):
         self.close()
 
 
-class TestObj:
-    def __init__(self, name, code):
-        self.name = name
-        self.code = code
+if __name__ == "__main__":
+    class TestObj:
+        def __init__(self, name, code):
+            self.name = name
+            self.code = code
 
 
-if __name__ == "__main__":
     app = QtWidgets.QApplication(sys.argv)
     window = ProfileInputGUI(list_of_objects=[TestObj('Test object', 'code')] * 10)
     window.resize(1.61 * 700.0, 600.0)  # golden ratio

{GridCal-5.1.39 → GridCal-5.1.41}/GridCal/Gui/object_model.py

@@ -270,7 +270,13 @@ class ObjectsModel(WrappableTableModel):
             if role == QtCore.Qt.ItemDataRole.DisplayRole:
                 return str(self.data_with_type(index))
             elif role == QtCore.Qt.ItemDataRole.BackgroundRole:
-                if 'color' in self.attributes[index.column()]:
+
+                if self.transposed:
+                    attr_idx = index.row()
+                else:
+                    attr_idx = index.column()
+
+                if 'color' in self.attributes[attr_idx]:
                     return QtGui.QColor(str(self.data_with_type(index)))
 
         return None