Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/danielhrisca/asammdf
Browse files Browse the repository at this point in the history
…into development
  • Loading branch information
danielhrisca committed Aug 26, 2024
2 parents 117550e + db8a1d3 commit 210a05f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/asammdf/mdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3956,7 +3956,7 @@ def iter_to_dataframe(
if *raw=False*. If this is True then the raw numeric values will be
used, and the conversion will not be applied.
use_interpolation (True) : bool
option to perform interpoaltions when multiple timestamp raster are
option to perform interpolations when multiple timestamp raster are
present. If *False* then dataframe columns will be automatically
filled with NaN's were the dataframe index values are not found in
the current column's timestamps
Expand Down Expand Up @@ -4372,7 +4372,7 @@ def to_dataframe(
.. versionadded:: 5.8.0
use_interpolation (True) : bool
option to perform interpoaltions when multiple timestamp raster are
option to perform interpolations when multiple timestamp raster are
present. If *False* then dataframe columns will be automatically
filled with NaN's were the dataframe index values are not found in
the current column's timestamps
Expand Down

0 comments on commit 210a05f

Please sign in to comment.