Skip to content

Commit

Permalink
iss #306 automaticatly filter out columns from measurement tables if …
Browse files Browse the repository at this point in the history
…all values are none
  • Loading branch information
BiancaMorandi committed Jan 19, 2023
1 parent 1254a30 commit a239df6
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions brightwind/load/station.py
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,8 @@ def get_table(self, detailed=False, wind_speeds=False, wind_directions=False, ca
'sensor_config.slope', 'sensor_config.offset', 'logger_measurement_config.slope',
'logger_measurement_config.offset', 'calibration.slope', 'calibration.offset',
'sensor_config.notes', 'logger_measurement_config.notes', 'sensor.notes']
df = pd.DataFrame(self.__meas_properties)
df = pd.DataFrame(self.__meas_properties).set_index(
['date_from', 'date_to']).dropna(axis=1, how='all').reset_index()
# get what is common from both lists and use this to filter df
cols_required = [col for col in cols_required if col in df.columns]
df = df[cols_required]
Expand All @@ -1019,10 +1020,11 @@ def get_table(self, detailed=False, wind_speeds=False, wind_directions=False, ca
'logger_measurement_config.offset', 'calibration.slope', 'calibration.offset',
'sensor_config.notes', 'logger_measurement_config.notes', 'sensor.notes']
df = pd.DataFrame(self.__meas_properties)
df = df[df['measurement_type_id'] == 'wind_speed'].set_index(
['date_from', 'date_to']).dropna(axis=1, how='all').reset_index()
# get what is common from both lists and use this to filter df
cols_required = [col for col in cols_required if col in df.columns]
df = df[cols_required]
df = df[df['measurement_type_id'] == 'wind_speed']
df.drop('measurement_type_id', 1, inplace=True)
# order rows
df.sort_values(['height_m', 'name'], ascending=[False, True], inplace=True)
Expand All @@ -1042,10 +1044,11 @@ def get_table(self, detailed=False, wind_speeds=False, wind_directions=False, ca
'logger_measurement_config.slope', 'logger_measurement_config.offset',
'sensor_config.notes', 'logger_measurement_config.notes', 'sensor.notes']
df = pd.DataFrame(self.__meas_properties)
df = df[df['measurement_type_id'] == 'wind_direction'].set_index(
['date_from', 'date_to']).dropna(axis=1, how='all').reset_index()
# get what is common from both lists and use this to filter df
cols_required = [col for col in cols_required if col in df.columns]
df = df[cols_required]
df = df[df['measurement_type_id'] == 'wind_direction']
df.drop('measurement_type_id', 1, inplace=True)
# order rows
df.sort_values(['height_m', 'name'], ascending=[False, True], inplace=True)
Expand Down

0 comments on commit a239df6

Please sign in to comment.