From aac9d935c5e44bf789a31c78846f58400e29df22 Mon Sep 17 00:00:00 2001 From: JB Lovland Date: Mon, 15 Jan 2024 15:44:20 +0100 Subject: [PATCH] CLN: Replace .dataframe with get_dataframe() --- src/fmu/dataio/_objectdata_provider.py | 22 +++++++++++----------- src/fmu/dataio/_utils.py | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/fmu/dataio/_objectdata_provider.py b/src/fmu/dataio/_objectdata_provider.py index 3f779358b..58dceac70 100644 --- a/src/fmu/dataio/_objectdata_provider.py +++ b/src/fmu/dataio/_objectdata_provider.py @@ -382,7 +382,7 @@ def _derive_spec_bbox_polygons(self) -> tuple[dict, dict]: specs = {} bbox = {} # number of polygons: - specs["npolys"] = np.unique(poly.dataframe[poly.pname].values).size + specs["npolys"] = np.unique(poly.get_dataframe()[poly.pname].values).size xmin, xmax, ymin, ymax, zmin, zmax = poly.get_boundary() bbox["xmin"] = float(xmin) @@ -402,17 +402,17 @@ def _derive_spec_bbox_points(self) -> tuple[dict[str, Any], dict[str, Any]]: bbox: dict[str, Any] = {} - if len(pnts.dataframe.columns) > 3: - attrnames = pnts.dataframe.columns[3:] + if len(pnts.get_dataframe().columns) > 3: + attrnames = pnts.get_dataframe().columns[3:] specs["attributes"] = list(attrnames) - specs["size"] = int(pnts.dataframe.size) - - bbox["xmin"] = float(pnts.dataframe[pnts.xname].min()) - bbox["xmax"] = float(pnts.dataframe[pnts.xname].max()) - bbox["ymax"] = float(pnts.dataframe[pnts.yname].min()) - bbox["ymin"] = float(pnts.dataframe[pnts.yname].max()) - bbox["zmin"] = float(pnts.dataframe[pnts.zname].min()) - bbox["zmax"] = float(pnts.dataframe[pnts.zname].max()) + specs["size"] = int(pnts.get_dataframe().size) + + bbox["xmin"] = float(pnts.get_dataframe()[pnts.xname].min()) + bbox["xmax"] = float(pnts.get_dataframe()[pnts.xname].max()) + bbox["ymax"] = float(pnts.get_dataframe()[pnts.yname].min()) + bbox["ymin"] = float(pnts.get_dataframe()[pnts.yname].max()) + bbox["zmin"] = float(pnts.get_dataframe()[pnts.zname].min()) + bbox["zmax"] = float(pnts.get_dataframe()[pnts.zname].max()) return specs, bbox diff --git a/src/fmu/dataio/_utils.py b/src/fmu/dataio/_utils.py index a735ccb7f..ffab48610 100644 --- a/src/fmu/dataio/_utils.py +++ b/src/fmu/dataio/_utils.py @@ -136,8 +136,8 @@ def export_file( out.zname = "Z" if isinstance(out, xtgeo.Polygons): # out.pname = "ID" not working - out.dataframe.rename(columns={out.pname: "ID"}, inplace=True) - out.dataframe.to_csv(filename, index=False) + out.get_dataframe().rename(columns={out.pname: "ID"}, inplace=True) + out.get_dataframe().to_csv(filename, index=False) elif filename.suffix == ".pol" and isinstance(obj, (xtgeo.Polygons, xtgeo.Points)): obj.to_file(filename) elif filename.suffix == ".segy" and isinstance(obj, xtgeo.Cube):