From a9542b5bdb2a0c5522b3e6cc5d0a021854b1894d Mon Sep 17 00:00:00 2001
From: santi <santiago.penate.vera@gmail.com>
Date: Wed, 2 Oct 2024 07:14:07 +0100
Subject: [PATCH 1/2] 5.1.47

---
 .idea/workspace.xml              | 211 +++++++++----------------------
 src/GridCal/__version__.py       |   2 +-
 src/GridCalEngine/__version__.py |   2 +-
 src/GridCalServer/__version__.py |   2 +-
 4 files changed, 63 insertions(+), 154 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 28bc13f17..e88770dd4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -28,15 +28,7 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="aa3ee678-6e91-470f-91a9-09e9d8a4756d" name="Changes" comment="Fixed map and schematic video processing">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GridCal/Session/file_handler.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GridCal/Session/file_handler.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GridCal/__version__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GridCal/__version__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GridCalEngine/IO/epc/epc_parser.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GridCalEngine/IO/epc/epc_parser.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GridCalEngine/__version__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GridCalEngine/__version__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GridCalServer/__version__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GridCalServer/__version__.py" afterDir="false" />
-    </list>
+    <list default="true" id="aa3ee678-6e91-470f-91a9-09e9d8a4756d" name="Changes" comment="5.1.46" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -76,7 +68,7 @@
     </favorite-branches>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="devel" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -132,43 +124,43 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "Git.Branch.Popup.ShowAllRemotes": "true",
-    "MATLAB_INTERPRETER": "/usr/local/MATLAB/R2018a/bin/matlab",
-    "Python tests.Nosetests for test_power_flow.test_zip.executor": "Debug",
-    "Python tests.Nosetests for tests.test_hydro.executor": "Run",
-    "Python tests.Nosetests for tests.test_opf_time_series.test_opf_ts.executor": "Run",
-    "Python tests.Nosetests for tests.test_topology_processor.executor": "Run",
-    "Python tests.Nosetests in admittance_matrix_test.py.executor": "Run",
-    "Python tests.Nosetests in deep_copy_test.py.executor": "Run",
-    "Python tests.Nosetests in tests.executor": "Run",
-    "Python tests.pytest in tests.executor": "Run",
-    "Python.AnalysisDialogue.executor": "Run",
-    "Python.ExecuteGridCal.executor": "Debug",
-    "Python.cgmes_rdfs_graph.executor": "Run",
-    "Python.new_circuit_objects.executor": "Run",
-    "Python.node_widget.executor": "Run",
-    "Python.pymoo_example.executor": "Debug",
-    "Python.update_gui_file (1).executor": "Run",
-    "Python.update_gui_file.executor": "Run",
-    "Python.upload_to_pypi.executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "199__finalize__cgmes__import",
-    "last_opened_file_path": "C:/Work/git_local/GridCal/doc",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "run.code.analysis.last.selected.profile": "aDefault",
-    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyIntegratedToolsModulesConfigurable",
-    "two.files.diff.last.used.file": "C:/WorkProjects/PycharmProjects/GridCal/src/trunk/cgmes_py_generator/cgmes_v2_4_15/cgmes_enums.py",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;Git.Branch.Popup.ShowAllRemotes&quot;: &quot;true&quot;,
+    &quot;MATLAB_INTERPRETER&quot;: &quot;/usr/local/MATLAB/R2018a/bin/matlab&quot;,
+    &quot;Python tests.Nosetests for test_power_flow.test_zip.executor&quot;: &quot;Debug&quot;,
+    &quot;Python tests.Nosetests for tests.test_hydro.executor&quot;: &quot;Run&quot;,
+    &quot;Python tests.Nosetests for tests.test_opf_time_series.test_opf_ts.executor&quot;: &quot;Run&quot;,
+    &quot;Python tests.Nosetests for tests.test_topology_processor.executor&quot;: &quot;Run&quot;,
+    &quot;Python tests.Nosetests in admittance_matrix_test.py.executor&quot;: &quot;Run&quot;,
+    &quot;Python tests.Nosetests in deep_copy_test.py.executor&quot;: &quot;Run&quot;,
+    &quot;Python tests.Nosetests in tests.executor&quot;: &quot;Run&quot;,
+    &quot;Python tests.pytest in tests.executor&quot;: &quot;Run&quot;,
+    &quot;Python.AnalysisDialogue.executor&quot;: &quot;Run&quot;,
+    &quot;Python.ExecuteGridCal.executor&quot;: &quot;Run&quot;,
+    &quot;Python.cgmes_rdfs_graph.executor&quot;: &quot;Run&quot;,
+    &quot;Python.new_circuit_objects.executor&quot;: &quot;Run&quot;,
+    &quot;Python.node_widget.executor&quot;: &quot;Run&quot;,
+    &quot;Python.pymoo_example.executor&quot;: &quot;Debug&quot;,
+    &quot;Python.update_gui_file (1).executor&quot;: &quot;Run&quot;,
+    &quot;Python.update_gui_file.executor&quot;: &quot;Run&quot;,
+    &quot;Python.upload_to_pypi.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;199__finalize__cgmes__import&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Work/git_local/GridCal/doc&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;aDefault&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyIntegratedToolsModulesConfigurable&quot;,
+    &quot;two.files.diff.last.used.file&quot;: &quot;C:/WorkProjects/PycharmProjects/GridCal/src/trunk/cgmes_py_generator/cgmes_v2_4_15/cgmes_enums.py&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="PyDebuggerOptionsProvider">
     <option name="mySaveCallSignatures" value="true" />
     <option name="mySupportGeventDebugging" value="true" />
@@ -190,7 +182,7 @@
       <recent name="C:\WorkProjects\PycharmProjects\GridCal\src\GridCalEngine\IO\cim\cgmes_v2_4_15\devices" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.ExecuteGridCal">
+  <component name="RunManager" selected="Python.upload_to_pypi">
     <configuration default="true" type="DjangoTestsConfigurationType">
       <module name="GridCalEngine" />
       <option name="ENV_FILES" value="" />
@@ -457,7 +449,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="cpp_clases" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="trial_code" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="GridCal" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -471,7 +463,7 @@
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/trunk/code_generation/cpp_clases.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/trunk/code_generation/trial_code.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -480,7 +472,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="trial_code" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="update_gui_file" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="GridCal" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -489,12 +481,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/trunk/code_generation" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/GridCal/Gui/Main" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/trunk/code_generation/trial_code.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/GridCal/Gui/Main/update_gui_file.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -503,7 +495,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="update_gui_file" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="upload_to_pypi" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="GridCal" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -512,12 +504,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/GridCal/Gui/Main" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/GridCal/Gui/Main/update_gui_file.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/upload_to_pypi.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -663,18 +655,18 @@
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Python.cpp_clases" />
-      <item itemvalue="Python.trial_code" />
       <item itemvalue="Python.update_gui_file" />
+      <item itemvalue="Python.upload_to_pypi" />
+      <item itemvalue="Python.trial_code" />
       <item itemvalue="Python.ExecuteGridCal" />
       <item itemvalue="Python tests.pytest in tests" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.ExecuteGridCal" />
         <item itemvalue="Python tests.pytest in tests" />
+        <item itemvalue="Python.ExecuteGridCal" />
         <item itemvalue="Python.trial_code" />
-        <item itemvalue="Python.cpp_clases" />
+        <item itemvalue="Python.upload_to_pypi" />
         <item itemvalue="Python.update_gui_file" />
       </list>
     </recent_temporary>
@@ -1382,7 +1374,7 @@
       <workItem from="1726654128819" duration="19000" />
       <workItem from="1726654159986" duration="7438000" />
       <workItem from="1727420069197" duration="17557000" />
-      <workItem from="1727810891017" duration="1145000" />
+      <workItem from="1727810891017" duration="4239000" />
     </task>
     <task id="LOCAL-00310" summary="implemented newtonPA time series">
       <created>1656059954202</created>
@@ -1727,7 +1719,7 @@
       <option name="project" value="LOCAL" />
       <updated>1698766404661</updated>
     </task>
-    <option name="localTasksCounter" value="536" />
+    <option name="localTasksCounter" value="539" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1761,9 +1753,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="imported voltage level dictionary" />
-    <MESSAGE value="separate statcom and upfc at facts raw import" />
-    <MESSAGE value="controllable_shunt: set_blocks function corrected" />
     <MESSAGE value="some corrections for raw roundtrip test" />
     <MESSAGE value="numerical circuit comparison" />
     <MESSAGE value="numerical circuit comparison for cgmes roundtrip" />
@@ -1786,7 +1775,10 @@
     <MESSAGE value="default RatioTapChanger added to cgmes export" />
     <MESSAGE value="Plenty of changes to improve the session objects working: added results loadinf logger&#10;Improved / fixed the video saving" />
     <MESSAGE value="Fixed map and schematic video processing" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed map and schematic video processing" />
+    <MESSAGE value="Added missing EPC files section" />
+    <MESSAGE value="Improvements&#10;Added new_bus_branch_diagram_from_bus" />
+    <MESSAGE value="5.1.46" />
+    <option name="LAST_COMMIT_MESSAGE" value="5.1.46" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -2255,18 +2247,6 @@
           <line>175</line>
           <option name="timeStamp" value="2131" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <condition expression="gc_prop.name == 'rate' and elm.name == 'l1'" language="Python" />
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/IO/gridcal/pack_unpack.py</url>
-          <line>1131</line>
-          <option name="timeStamp" value="2134" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <condition expression="gc_prop.name == 'rate' and elm.name == 'l1'" language="Python" />
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/IO/gridcal/pack_unpack.py</url>
-          <line>1135</line>
-          <option name="timeStamp" value="2154" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <condition expression="not np.allclose(l1.B / 2, b_2[i], atol=1e-4)" language="Python" />
           <url>file://$PROJECT_DIR$/src/tests/test_line_params.py</url>
@@ -2288,77 +2268,6 @@
           <line>78</line>
           <option name="timeStamp" value="2164" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCal/Gui/Diagrams/base_diagram_widget.py</url>
-          <line>649</line>
-          <option name="timeStamp" value="2167" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCal/Gui/Diagrams/base_diagram_widget.py</url>
-          <line>112</line>
-          <option name="timeStamp" value="2168" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCal/Gui/Diagrams/base_diagram_widget.py</url>
-          <line>136</line>
-          <option name="timeStamp" value="2169" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCal/Gui/Diagrams/base_diagram_widget.py</url>
-          <line>144</line>
-          <option name="timeStamp" value="2170" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/trunk/code_generation/cpp_clases.py</url>
-          <line>79</line>
-          <option name="timeStamp" value="2174" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <condition expression="len(parent_class_properties)" language="Python" />
-          <url>file://$PROJECT_DIR$/src/trunk/code_generation/cpp_clases.py</url>
-          <line>58</line>
-          <option name="timeStamp" value="2175" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/Devices/Parents/editable_device.py</url>
-          <line>749</line>
-          <option name="timeStamp" value="2179" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/IO/epc/epc_parser.py</url>
-          <line>51</line>
-          <option name="timeStamp" value="2180" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/IO/epc/epc_parser.py</url>
-          <line>671</line>
-          <option name="timeStamp" value="2181" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/IO/epc/epc_parser.py</url>
-          <line>48</line>
-          <option name="timeStamp" value="2183" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/IO/epc/epc_parser.py</url>
-          <line>603</line>
-          <option name="timeStamp" value="2189" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/IO/file_handler.py</url>
-          <line>229</line>
-          <option name="timeStamp" value="2194" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCal/Gui/Main/SubClasses/io.py</url>
-          <line>413</line>
-          <option name="timeStamp" value="2195" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/GridCalEngine/basic_structures.py</url>
-          <line>274</line>
-          <option name="timeStamp" value="2196" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -2717,7 +2626,7 @@
     <SUITE FILE_PATH="coverage/GridCal$dc_linear_opf_ts_example.coverage" NAME="dc_linear_opf_ts_example Coverage Results" MODIFIED="1688480027790" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/examples" />
     <SUITE FILE_PATH="coverage/GridCal$contingency_planner_dialogue.coverage" NAME="contingency_planner_dialogue Coverage Results" MODIFIED="1687935669832" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/GridCal/Gui/ContingencyPlanner" />
     <SUITE FILE_PATH="coverage/GridCal$demo_sum_of_int.coverage" NAME="demo_sum_of_int Coverage Results" MODIFIED="1663317493075" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/research/genetic_algorithms/iDone" />
-    <SUITE FILE_PATH="coverage/GridCal$ExecuteGridCal.coverage" NAME="ExecuteGridCal Coverage Results" MODIFIED="1727812001320" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/GridCal" />
+    <SUITE FILE_PATH="coverage/GridCal$ExecuteGridCal.coverage" NAME="ExecuteGridCal Coverage Results" MODIFIED="1727812947586" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/GridCal" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_for_tests_test_hydro_test_hydro_opf2.coverage" NAME="Nosetests for tests.test_hydro.test_hydro_opf2 Coverage Results" MODIFIED="1704897106653" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$vispy_graph.coverage" NAME="vispy_graph Coverage Results" MODIFIED="1647609573310" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/research/visualization" />
     <SUITE FILE_PATH="coverage/GridCal$pytest_for_test_set_snapshot_test_set_snapshot.coverage" NAME="pytest for test_set_snapshot.test_set_snapshot Coverage Results" MODIFIED="1725888937432" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
@@ -2787,7 +2696,7 @@
     <SUITE FILE_PATH="coverage/GridCal$opf_pf_verification_example.coverage" NAME="opf+pf verification example Coverage Results" MODIFIED="1696857463367" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/examples" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_for_test_ptdf_test_compensated_ptdf.coverage" NAME="Nosetests for test_ptdf.test_compensated_ptdf Coverage Results" MODIFIED="1710433602844" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$topology_driver.coverage" NAME="topology_driver Coverage Results" MODIFIED="1590932816525" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/GridCal/Engine/Simulations/Topology" />
-    <SUITE FILE_PATH="coverage/GridCal$upload_to_pypi.coverage" NAME="upload_to_pypi Coverage Results" MODIFIED="1727809973439" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
+    <SUITE FILE_PATH="coverage/GridCal$upload_to_pypi.coverage" NAME="upload_to_pypi Coverage Results" MODIFIED="1727814043470" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_for_test_numerical_circuit_test_numerical_cicuit_spv.coverage" NAME="Nosetests for test_numerical_circuit.test_numerical_cicuit_spv Coverage Results" MODIFIED="1706775363122" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_in_test_api_py.coverage" NAME="Nosetests in test_api.py Coverage Results" MODIFIED="1598803532944" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$pytest_for_src_tests_test_tutorials_test_define_grid_from_scratch_without_profiles.coverage" NAME="pytest for src.tests.test_tutorials.test_define_grid_from_scratch_without_profiles Coverage Results" MODIFIED="1662359418874" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
@@ -2819,7 +2728,7 @@
     <SUITE FILE_PATH="coverage/GridCal$linear_analysis_sesco.coverage" NAME="linear_analysis_sesco Coverage Results" MODIFIED="1646937847934" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/GridCal/Engine/Simulations/LinearFactors" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_in_ACPTDF_research2_py.coverage" NAME="Nosetests in ACPTDF_research2.py Coverage Results" MODIFIED="1601969138193" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/research/PTDF" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_in_test_reverse_transformer_definition_py.coverage" NAME="Nosetests in test_reverse_transformer_definition.py Coverage Results" MODIFIED="1609501285838" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
-    <SUITE FILE_PATH="coverage/GridCal$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1727809799174" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
+    <SUITE FILE_PATH="coverage/GridCal$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1727813815998" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_for_tests_test_continuation_power_flow_test_cpf.coverage" NAME="Nosetests for tests.test_continuation_power_flow.test_cpf Coverage Results" MODIFIED="1712337251546" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$rpgm_algo.coverage" NAME="rpgm_algo Coverage Results" MODIFIED="1603645665438" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/GridCal/ThirdParty/SyntheticNetworks" />
     <SUITE FILE_PATH="coverage/GridCal$pytest_for_src_tests_test_tutorials_test_define_grid_from_scratch_with_profiles.coverage" NAME="pytest for src.tests.test_tutorials.test_define_grid_from_scratch_with_profiles Coverage Results" MODIFIED="1724499242496" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
diff --git a/src/GridCal/__version__.py b/src/GridCal/__version__.py
index 6bb3cba04..fc423843d 100644
--- a/src/GridCal/__version__.py
+++ b/src/GridCal/__version__.py
@@ -16,7 +16,7 @@
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.1.46"
+__GridCal_VERSION__ = "5.1.47"
 
 url = 'https://github.com/SanPen/GridCal'
 
diff --git a/src/GridCalEngine/__version__.py b/src/GridCalEngine/__version__.py
index b9862bc52..1ae8b059e 100644
--- a/src/GridCalEngine/__version__.py
+++ b/src/GridCalEngine/__version__.py
@@ -16,7 +16,7 @@
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.1.46"
+__GridCalEngine_VERSION__ = "5.1.47"
 
 url = 'https://github.com/SanPen/GridCal'
 
diff --git a/src/GridCalServer/__version__.py b/src/GridCalServer/__version__.py
index 522c6a823..596fdc9cd 100644
--- a/src/GridCalServer/__version__.py
+++ b/src/GridCalServer/__version__.py
@@ -16,7 +16,7 @@
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalServer_VERSION__ = "5.1.46"
+__GridCalServer_VERSION__ = "5.1.47"
 
 url = 'https://github.com/SanPen/GridCal'
 

From 2af93e8f798ad2b53bf316d05237d60581d04b41 Mon Sep 17 00:00:00 2001
From: santi <santiago.penate.vera@gmail.com>
Date: Wed, 2 Oct 2024 08:38:39 +0100
Subject: [PATCH 2/2] Improved plotting Added to_list in Associations Added
 tech_list to Injection Parent

---
 .../Gui/Diagrams/MapWidget/grid_map_widget.py |  4 ++--
 .../SchematicWidget/schematic_widget.py       |  4 ++--
 .../Gui/Diagrams/base_diagram_widget.py       | 19 ++++++++++---------
 src/GridCal/__version__.py                    |  2 +-
 .../Devices/Associations/association.py       |  9 ++++++++-
 .../Devices/Parents/injection_parent.py       | 11 ++++++++++-
 .../Simulations/results_table.py              |  6 ++++--
 src/GridCalEngine/__version__.py              |  2 +-
 src/GridCalServer/__version__.py              |  2 +-
 9 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py b/src/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py
index 282a22654..a6ee1d279 100644
--- a/src/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py
+++ b/src/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py
@@ -1278,10 +1278,10 @@ def plot_substation(self, i: int, api_object: Substation):
                     if results is not None:
                         if isinstance(results, PowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Power flow")
                         elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Optimal power flow")
 
                 # Injections
                 # filter injections by bus
diff --git a/src/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py b/src/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py
index 8345ad598..2ffb110e8 100644
--- a/src/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py
+++ b/src/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py
@@ -3737,10 +3737,10 @@ def plot_bus(self, i: int, api_object: Bus):
                     if results is not None:
                         if isinstance(results, PowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Power flow")
                         elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Optimal power flow")
 
                 # Injections
                 # filter injections by bus
diff --git a/src/GridCal/Gui/Diagrams/base_diagram_widget.py b/src/GridCal/Gui/Diagrams/base_diagram_widget.py
index acc0079d6..53d5cf695 100644
--- a/src/GridCal/Gui/Diagrams/base_diagram_widget.py
+++ b/src/GridCal/Gui/Diagrams/base_diagram_widget.py
@@ -18,6 +18,7 @@
 from typing import List, Dict, Union, Tuple, Callable, TYPE_CHECKING
 import numpy as np
 import cv2
+from docutils.nodes import title
 from matplotlib import pyplot as plt
 
 from PySide6.QtCore import Qt
@@ -325,47 +326,47 @@ def plot_branch(self, i: int, api_object: Union[Line, DcLine, Transformer2W, VSC
                 if isinstance(results, PowerFlowTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Power flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Power loading")
                     any_plot = True
 
                 elif isinstance(results, LinearAnalysisTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Linear flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Linear loading")
                     any_plot = True
 
                 elif isinstance(results, ContingencyAnalysisTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.MaxContingencyFlows)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Contingency flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.MaxContingencyLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Contingency loading")
                     any_plot = True
 
                 elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Optimal power flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Optimal loading")
                     any_plot = True
 
                 elif isinstance(results, StochasticPowerFlowResults):
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoadingAverage)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Stochastic loading")
                     any_plot = True
 
         if any_plot:
diff --git a/src/GridCal/__version__.py b/src/GridCal/__version__.py
index fc423843d..060ce4833 100644
--- a/src/GridCal/__version__.py
+++ b/src/GridCal/__version__.py
@@ -16,7 +16,7 @@
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.1.47"
+__GridCal_VERSION__ = "5.1.48"
 
 url = 'https://github.com/SanPen/GridCal'
 
diff --git a/src/GridCalEngine/Devices/Associations/association.py b/src/GridCalEngine/Devices/Associations/association.py
index 39ee5c1eb..f618c8c67 100644
--- a/src/GridCalEngine/Devices/Associations/association.py
+++ b/src/GridCalEngine/Devices/Associations/association.py
@@ -88,7 +88,7 @@ def __init__(self, device_type: DeviceType):
         self._device_type = device_type
 
     @property
-    def data(self):
+    def data(self) -> Dict[str, Association]:
         """
 
         :return:
@@ -168,6 +168,13 @@ def to_dict(self) -> List[Dict[str, Union[str, float]]]:
         """
         return [val.to_dict() for _, val in self._data.items()]
 
+    def to_list(self) -> List[ALL_DEV_TYPES]:
+        """
+        Get a list of the associated api objects
+        :return:
+        """
+        return [val.api_object for _, val in self._data.items()]
+
     def parse(self,
               data: List[Dict[str, Union[str, float]]],
               elements_dict: Dict[str, ALL_DEV_TYPES],
diff --git a/src/GridCalEngine/Devices/Parents/injection_parent.py b/src/GridCalEngine/Devices/Parents/injection_parent.py
index 6b7379d61..36119e554 100644
--- a/src/GridCalEngine/Devices/Parents/injection_parent.py
+++ b/src/GridCalEngine/Devices/Parents/injection_parent.py
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import Union, TYPE_CHECKING
+from typing import Union, List, TYPE_CHECKING
 import numpy as np
 
 from GridCalEngine.Devices.Parents.physical_device import PhysicalDevice
@@ -28,6 +28,7 @@
 
 if TYPE_CHECKING:
     from GridCalEngine.Devices import Technology
+    from GridCalEngine.Devices.types import ALL_DEV_TYPES
 
 
 class InjectionParent(PhysicalDevice):
@@ -236,3 +237,11 @@ def associate_technology(self, tech: Technology, val=1.0):
         :return:
         """
         self.technologies.add_object(tech, val=val)
+
+    @property
+    def tech_list(self) -> List[ALL_DEV_TYPES]:
+        """
+        Bus
+        :return: Bus
+        """
+        return self.technologies.to_list()
diff --git a/src/GridCalEngine/Simulations/results_table.py b/src/GridCalEngine/Simulations/results_table.py
index 5cb65540f..70d3f8053 100644
--- a/src/GridCalEngine/Simulations/results_table.py
+++ b/src/GridCalEngine/Simulations/results_table.py
@@ -375,16 +375,18 @@ def plot(self, ax=None, selected_col_idx=None, selected_rows=None, stacked=False
         except TypeError:
             print('No numeric data to plot...')
 
-    def plot_device(self, ax=None, device_idx: int = 0, stacked=False):
+    def plot_device(self, ax=None, device_idx: int = 0, stacked=False, title: str = ""):
         """
         Plot the data model
         :param ax: Matplotlib axis
         :param device_idx: list of selected column indices
         :param stacked: Stack plot?
+        :param title: Title of the plot
         """
         index, columns, data = self.get_data()
 
-        columns = [columns[device_idx]]
+        # columns = [columns[device_idx]]
+        columns = [self.title] if title == "" else [title]
         data = data[:, device_idx]
 
         if ax is None:
diff --git a/src/GridCalEngine/__version__.py b/src/GridCalEngine/__version__.py
index 1ae8b059e..7e7e69123 100644
--- a/src/GridCalEngine/__version__.py
+++ b/src/GridCalEngine/__version__.py
@@ -16,7 +16,7 @@
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.1.47"
+__GridCalEngine_VERSION__ = "5.1.48"
 
 url = 'https://github.com/SanPen/GridCal'
 
diff --git a/src/GridCalServer/__version__.py b/src/GridCalServer/__version__.py
index 596fdc9cd..285595995 100644
--- a/src/GridCalServer/__version__.py
+++ b/src/GridCalServer/__version__.py
@@ -16,7 +16,7 @@
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalServer_VERSION__ = "5.1.47"
+__GridCalServer_VERSION__ = "5.1.48"
 
 url = 'https://github.com/SanPen/GridCal'