tinaok commited on
Commit
613f71e
·
verified ·
1 Parent(s): fec3245
Files changed (1) hide show
  1. app.py +33 -63
app.py CHANGED
@@ -164,6 +164,38 @@ def load_netCDF(selected_file):
164
  ]
165
  return fix_time(ds)
166
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
167
  class SADCP_Viewer(param.Parameterized):
168
  df = load_csv()
169
  bathy = load_bathymetry()
@@ -235,61 +267,10 @@ class SADCP_Viewer(param.Parameterized):
235
  if not selected_file or selected_file not in files:
236
  selected_file = files[0]
237
  self.file_dropdown.value = selected_file
238
- dataframe = sorted_df[sorted_df["file_name"] == selected_file].drop(
239
- columns=[
240
- "file_name",
241
- "title",
242
- "Conventions",
243
- "featureType",
244
- "date_update",
245
- "ADCP_beam_angle",
246
- "ADCP_ship_angle",
247
- "middle_bin1_depth",
248
- "heading_corr",
249
- "pitch_corr",
250
- "ampli_corr",
251
- "pitch_roll_used",
252
- "date_creation",
253
- "ADCP_type",
254
- "data_type",
255
- ]
256
- )
257
- dataframe2 = sorted_df[sorted_df["file_name"] == selected_file].drop(
258
- columns=[
259
- "file_name",
260
- "date_start",
261
- "date_end",
262
- "ADCP_frequency(kHz)",
263
- "bin_length(meter)",
264
- "year",
265
- ]
266
- )
267
 
268
  self.ds=load_netCDF(selected_file)
269
 
270
- # self.ds = self.ds.where(
271
- # (self.ds.VCUR_SEADATANET_QC == 49)
272
- # & (self.ds.UCUR_SEADATANET_QC == 49)
273
- # #& (self.ds.WCUR_SEADATANET_QC == 49)
274
- # #& (self.ds.ECUR_SEADATANET_QC == 49)
275
- # # & (self.ds.PGOOD_SEADATANET_QC == 49)
276
- # #& (self.ds.ECI_SEADATANET_QC == 49)
277
- # #& (self.ds.BOTTOM_DEPTH_SEADATANET_QC == 49)
278
- # # & (self.ds.BATHY_SEADATANET_QC == 49)
279
- # & (self.ds.USHIP_SEADATANET_QC == 49)
280
- # & (self.ds.VSHIP_SEADATANET_QC == 49),
281
- # drop=False)
282
- # self.ds = self.ds[
283
- # [
284
- # "TIME",
285
- # "USHIP", "VSHIP", "BATHY", "BOTTOM_DEPTH",
286
- # "UCUR", "VCUR",
287
- # "ROLL", "PITCH", "TR_TEMP", "HEADING", "U_BOTTOM", "V_BOTTOM",
288
- # "WCUR", "ECUR", "PGOOD", "ECI", "UTIDE", "VTIDE",
289
- # ]
290
- # ]
291
-
292
-
293
  lon_range = (
294
  int(self.ds["LONGITUDE"].min().round() - 1),
295
  int(self.ds["LONGITUDE"].max().round() + 1),
@@ -301,12 +282,6 @@ class SADCP_Viewer(param.Parameterized):
301
  self.depth1 = abs(self.ds.coords["PROFZ"])
302
  deph_range = (int(self.depth1.min()), int(self.depth1.max()))
303
 
304
- # Ku_std_dataarray = xr.DataArray(Ku_std,dims='dim1')
305
-
306
- # date=dataset.assign(TIME=date)
307
-
308
- # dataset['TIME']=dataset['TIME'].assign_coords(dim=dataset.dims['MAXT'])
309
-
310
  self.longitude_slider.start = lon_range[0]
311
  self.longitude_slider.end = lon_range[1]
312
  self.longitude_slider.value = lon_range
@@ -329,11 +304,6 @@ class SADCP_Viewer(param.Parameterized):
329
 
330
  # self.update_plots()
331
  self.ds.close()
332
- self.dataframe = dataframe.transpose()
333
- self.dataframe2 = dataframe2.transpose()
334
- # self.transposed_dataframe = dataframe.transpose()
335
- self.data_table.value = self.dataframe
336
- self.metadata_table.value = self.dataframe2
337
 
338
  @param.depends(
339
  "year_slider.value",
 
164
  ]
165
  return fix_time(ds)
166
 
167
+ def filter_df(sorted_df,selected_file):
168
+ dataframe = sorted_df[sorted_df["file_name"] == selected_file].drop(
169
+ columns=[
170
+ "file_name",
171
+ "title",
172
+ "Conventions",
173
+ "featureType",
174
+ "date_update",
175
+ "ADCP_beam_angle",
176
+ "ADCP_ship_angle",
177
+ "middle_bin1_depth",
178
+ "heading_corr",
179
+ "pitch_corr",
180
+ "ampli_corr",
181
+ "pitch_roll_used",
182
+ "date_creation",
183
+ "ADCP_type",
184
+ "data_type",
185
+ ]
186
+ )
187
+ dataframe2 = sorted_df[sorted_df["file_name"] == selected_file].drop(
188
+ columns=[
189
+ "file_name",
190
+ "date_start",
191
+ "date_end",
192
+ "ADCP_frequency(kHz)",
193
+ "bin_length(meter)",
194
+ "year",
195
+ ]
196
+ )
197
+ return dataframe.transpose(), dataframe2.transpose()
198
+
199
  class SADCP_Viewer(param.Parameterized):
200
  df = load_csv()
201
  bathy = load_bathymetry()
 
267
  if not selected_file or selected_file not in files:
268
  selected_file = files[0]
269
  self.file_dropdown.value = selected_file
270
+ self.data_table.value, self.metadata_table.value = filter_df(sorted_df,selected_file)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
271
 
272
  self.ds=load_netCDF(selected_file)
273
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
274
  lon_range = (
275
  int(self.ds["LONGITUDE"].min().round() - 1),
276
  int(self.ds["LONGITUDE"].max().round() + 1),
 
282
  self.depth1 = abs(self.ds.coords["PROFZ"])
283
  deph_range = (int(self.depth1.min()), int(self.depth1.max()))
284
 
 
 
 
 
 
 
285
  self.longitude_slider.start = lon_range[0]
286
  self.longitude_slider.end = lon_range[1]
287
  self.longitude_slider.value = lon_range
 
304
 
305
  # self.update_plots()
306
  self.ds.close()
 
 
 
 
 
307
 
308
  @param.depends(
309
  "year_slider.value",