GridCal 5.1.17__tar.gz → 5.1.18__tar.gz

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

@@ -738,11 +738,6 @@ 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.horizontalLayout_9.addWidget(self.association_label)
-
         self.horizontalSpacer_8 = QSpacerItem(794, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_9.addItem(self.horizontalSpacer_8)
@@ -4764,7 +4759,6 @@ 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.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))

{GridCal-5.1.17 → GridCal-5.1.18}/GridCal/Gui/Main/SubClasses/Model/objects.py

@@ -359,14 +359,14 @@ class ObjectsTableMain(DiagramsMain):
         :return:
         """
         dev_type_text = self.get_db_object_selected_type()
+        model = self.get_current_objects_model_view()
+        association_prperty_name = self.ui.associationsComboBox.currentText()
 
-        if dev_type_text is not None:
-
-            elements = self.get_current_objects_model_view().objects
+        if dev_type_text is not None and model is not None and association_prperty_name != "":
 
-            association_prperty_name = self.ui.associationsComboBox.currentText()
+            elements = model.objects
 
-            if len(elements) > 0 and association_prperty_name != "":
+            if len(elements) > 0:
 
                 gc_prop = elements[0].get_property_by_name(prop_name=association_prperty_name)
                 associations: dev.Associations = elements[0].get_snapshot_value_by_name(name=association_prperty_name)
@@ -457,17 +457,20 @@ class ObjectsTableMain(DiagramsMain):
                 # update the associations view
                 assoc_mdl = gf.get_list_model(self.circuit.device_associations[elm_type])
                 self.ui.associationsComboBox.setModel(assoc_mdl)
+                self.display_associations()
 
             else:
                 self.ui.dataStructureTableView.setModel(None)
                 self.ui.device_type_magnitude_comboBox.clear()
                 self.ui.device_type_magnitude_comboBox_2.clear()
                 self.ui.associationsComboBox.clear()
+                self.ui.dataStructureTableView.setModel(None)
         else:
             self.ui.dataStructureTableView.setModel(None)
             self.ui.device_type_magnitude_comboBox.clear()
             self.ui.device_type_magnitude_comboBox_2.clear()
             self.ui.associationsComboBox.clear()
+            self.ui.dataStructureTableView.setModel(None)
 
     def get_selected_objects(self) -> List[ALL_DEV_TYPES]:
         """

{GridCal-5.1.17 → GridCal-5.1.18}/GridCal/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.1.17"
+__GridCal_VERSION__ = "5.1.18"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCal-5.1.17 → GridCal-5.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 5.1.17
+Version: 5.1.18
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.