cassiebuhler commited on
Commit
6937225
·
1 Parent(s): 35de2ab

fixed mislabeled axis in the bar charts

Browse files
Files changed (1) hide show
  1. app/utils.py +7 -3
app/utils.py CHANGED
@@ -249,7 +249,7 @@ def stacked_bar(df, x, y, color, title, colors):
249
  return create_bar_chart(df, x, y, title, color=color, stacked=True, colors=colors)
250
 
251
 
252
- def get_chart_settings(x, stacked):
253
  """
254
  Returns sorting, axis settings, and y-axis title mappings.
255
  """
@@ -276,11 +276,15 @@ def get_chart_settings(x, stacked):
276
  "mean_manageable_carbon": "Manageable Carbon (Mean)", "mean_disadvantaged": "Disadvantaged (Mean)",
277
  "mean_svi": "SVI (Mean)", "mean_fire": "Fire (Mean)", "mean_rxburn": "Rx Fire (Mean)"
278
  }
 
 
 
 
279
 
280
  angle = 270 if x in ["manager_type", "ecoregion"] else 0
281
  height = 250 if stacked else 400 if x == "ecoregion" else 350 if x == "manager_type" else 300
282
 
283
- return sort_options.get(x, "x"), angle, height, y_titles.get(x, x)
284
 
285
 
286
  def get_label_transform(x, label=None):
@@ -326,7 +330,7 @@ def create_bar_chart(df, x, y, title, color=None, stacked=False, colors=None):
326
  Generalized function to create a bar chart, supporting both standard and stacked bars.
327
  """
328
  # helper functions
329
- sort, angle, height, y_title = get_chart_settings(x,stacked)
330
  label_transform = get_label_transform(x)
331
 
332
  # create base chart
 
249
  return create_bar_chart(df, x, y, title, color=color, stacked=True, colors=colors)
250
 
251
 
252
+ def get_chart_settings(x, y, stacked):
253
  """
254
  Returns sorting, axis settings, and y-axis title mappings.
255
  """
 
276
  "mean_manageable_carbon": "Manageable Carbon (Mean)", "mean_disadvantaged": "Disadvantaged (Mean)",
277
  "mean_svi": "SVI (Mean)", "mean_fire": "Fire (Mean)", "mean_rxburn": "Rx Fire (Mean)"
278
  }
279
+ if stacked:
280
+ y_titles = y_titles.get(x,x)
281
+ else:
282
+ y_titles = y_titles.get(y,y)
283
 
284
  angle = 270 if x in ["manager_type", "ecoregion"] else 0
285
  height = 250 if stacked else 400 if x == "ecoregion" else 350 if x == "manager_type" else 300
286
 
287
+ return sort_options.get(x, "x"), angle, height, y_titles
288
 
289
 
290
  def get_label_transform(x, label=None):
 
330
  Generalized function to create a bar chart, supporting both standard and stacked bars.
331
  """
332
  # helper functions
333
+ sort, angle, height, y_title = get_chart_settings(x, y, stacked)
334
  label_transform = get_label_transform(x)
335
 
336
  # create base chart