Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/e2nIEE/pandapower into f…
Browse files Browse the repository at this point in the history
…eature/jao_converter
  • Loading branch information
SteffenMeinecke committed Nov 13, 2024
2 parents 7fe2309 + d9ada10 commit 804d23f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pandapower/plotting/plotly/simple_plotly.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def simple_plotly(net, respect_switches=True, use_line_geo=None, on_map=False,
**respect_switches** (bool, True) - Respect switches when artificial geodata is created
**use_line_geo** (bool, True) - defines if lines patches are based on
net.line_geodata of the lines (True) or on net.bus_geodata of the connected buses (False)
net.line.geo of the lines (True) or on net.bus.geo of the connected buses (False)
**on_map** (bool, False) - enables using mapbox plot in plotly.
If provided geodata are not real geo-coordinates in lon/lat form, on_map will be set to False.
Expand Down
4 changes: 2 additions & 2 deletions pandapower/plotting/plotly/vlevel_plotly.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ def vlevel_plotly(net, respect_switches=True, use_line_geo=None, colors_dict=Non
OPTIONAL:
**respect_switches** (bool, True) - Respect switches when artificial geodata is created
**use_line_geo** (bool, True) - defines if lines patches are based on net.line_geodata
of the lines (True) or on net.bus_geodata of the connected buses (False)
**use_line_geo** (bool, True) - defines if lines patches are based on net.line.geo
of the lines (True) or on net.bus.geo of the connected buses (False)
*colors_dict** (dict, None) - dictionary for customization of colors for each voltage level
in the form: voltage : color
Expand Down
2 changes: 1 addition & 1 deletion pandapower/toolbox/data_modification.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def create_continuous_elements_index(net, start=0, add_df_to_reindex=set()):

if et in net and isinstance(net[et], pd.DataFrame):
if et in ["bus_geodata", "line_geodata"]:
logger.info(et + " don't need to bo included to 'add_df_to_reindex'. It is " +
logger.info(et + " don't need to be included to 'add_df_to_reindex'. It is " +
"already included by et=='" + et.split("_")[0] + "'.")
else:
reindex_elements(net, et, new_index)
Expand Down

0 comments on commit 804d23f

Please sign in to comment.