gsztlyptr commited on
Commit
dfcbad8
·
verified ·
1 Parent(s): 94ddc30

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +6 -5
app.py CHANGED
@@ -424,12 +424,13 @@ inter_labres = pn.bind(labres, column_changer)
424
  def lab_management(year_slider, column_changer):
425
  scatterdata = df[(df.year == year_slider)&(df.people.str.contains('KGYC|Cyto'))].sort_values(by="people", \
426
  ascending=False,key=natsort_keygen()).reset_index(drop=True)
 
427
  ref = df[column_changer].iloc[0]
428
- lab = scatterdata[column_changer].iloc[0]
429
 
430
- max_x = scatterdata[column_changer].max()
431
- max_x_abn = scatterdata[scatterdata.people.str.contains('ytolog')][column_changer].max()
432
- min_x = scatterdata[column_changer].min()
433
  if column_changer != 'ASC-US/ASC-H ratio(%)':
434
  tooltips_cp = f"""
435
  <div>
@@ -453,7 +454,7 @@ def lab_management(year_slider, column_changer):
453
  </div>
454
  """
455
  hover_cp = HoverTool(tooltips=tooltips_cp)
456
- scatter_plot = scatterdata[scatterdata.people.str.contains('Cyto', na=False)].hvplot.scatter(x=column_changer, y='people', color='black', size=sdot_size, height= sheight,
457
  xlim=(0,max_x+0.5), xticks = [0,lab,ref, max_x], grid=True, title=column_changer,
458
  xformatter='%.1f',xlabel ='', ylabel='', tools = [hover_cp]).opts(fontsize = pl_title, fontscale=f_scale_lab, shared_axes=False, toolbar=None, default_tools = [])
459
  ref_vline = hv.VLine(x=ref).opts(color='black', alpha = 1).opts(shared_axes=False,toolbar=None, default_tools = [])
 
424
  def lab_management(year_slider, column_changer):
425
  scatterdata = df[(df.year == year_slider)&(df.people.str.contains('KGYC|Cyto'))].sort_values(by="people", \
426
  ascending=False,key=natsort_keygen()).reset_index(drop=True)
427
+ scatterdata_filtered = scatterdata[~scatterdata.people.str.contains('Cytologist 8', case=False, na=False)]
428
  ref = df[column_changer].iloc[0]
429
+ lab = scatterdata_filtered[column_changer].iloc[0]
430
 
431
+ max_x = scatterdata_filtered[column_changer].max()
432
+ max_x_abn = scatterdata_filtered[scatterdata.people.str.contains('ytolog')][column_changer].max()
433
+ min_x = scatterdata_filtered[column_changer].min()
434
  if column_changer != 'ASC-US/ASC-H ratio(%)':
435
  tooltips_cp = f"""
436
  <div>
 
454
  </div>
455
  """
456
  hover_cp = HoverTool(tooltips=tooltips_cp)
457
+ scatter_plot = scatterdata_filtered[scatterdata.people.str.contains('Cyto', na=False)].hvplot.scatter(x=column_changer, y='people', color='black', size=sdot_size, height= sheight,
458
  xlim=(0,max_x+0.5), xticks = [0,lab,ref, max_x], grid=True, title=column_changer,
459
  xformatter='%.1f',xlabel ='', ylabel='', tools = [hover_cp]).opts(fontsize = pl_title, fontscale=f_scale_lab, shared_axes=False, toolbar=None, default_tools = [])
460
  ref_vline = hv.VLine(x=ref).opts(color='black', alpha = 1).opts(shared_axes=False,toolbar=None, default_tools = [])