Update app.py

app.py

@@ -700,101 +700,132 @@ final6 = alt.vconcat(chart1, chart2, chart3).resolve_scale(x='shared')
 #Final_Final
 final_final = (final | final2 | final3 ) & (final4 | final5 | final6)
 
-#Dashboard
-import panel as pn
-import vega_datasets
 
-# Enable Panel extensions
+# we want to use bootstrap/template, tell Panel to load up what we need
 pn.extension(design='bootstrap')
+
+# we want to use vega, tell Panel to load up what we need
 pn.extension('vega')
 
+# create a basic template using bootstrap
 template = pn.template.BootstrapTemplate(
-    title='SI649 Project2',
+    title='SI649 project2test',
 )
 
-# the main column will hold our key content
 maincol = pn.Column()
+maincol.append("TEST")
 
-options1 = ['ALL', 'Choose Your Own', 'Based On Category']
-select0 = pn.widgets.Select(options=options1, name='Choose what to compare')
-# maincol.append(select0)
+template.main.append(maincol)
 
-# Charts
-charts = []
-charts.append(final)
-charts.append(final2)
-charts.append(final3)
-charts.append(final4)
-charts.append(final5)
-charts.append(final6)
+template.servable(title="SI649 Project2Test")
 
-# Define options for dropdown
-options = [f'Chart {i+1}' for i in range(len(charts))]
 
-# Panel widgets
-select1 = pn.widgets.Select(options=options, name='Select Chart 1')
-select2 = pn.widgets.Select(options=options, name='Select Chart 2')
+# #Dashboard
+# import panel as pn
+# import vega_datasets
 
-options = ['Altruism', 'Fairness', 'spite', 'trust', 'reciprocity', 'free-riding', 'cooperation']
-select_widget = pn.widgets.Select(options=options, name='Select a category')
+# # Enable Panel extensions
+# pn.extension(design='bootstrap')
+# pn.extension('vega')
 
+# template = pn.template.BootstrapTemplate(
+#     title='SI649 Project2',
+# )
 
-# Define function to update chart
-def update_chart(value):
-    if value:
-        index = int(value.split()[-1]) - 1
-        return charts[index]
-    else:
-        return None
+# # the main column will hold our key content
+# maincol = pn.Column()
 
-# Combine dropdown and chart
-@pn.depends(select1.param.value, select2.param.value)
-def update_plots(value1, value2):
-    selected_chart1 = update_chart(value1)
-    selected_chart2 = update_chart(value2)
-    if selected_chart1 and selected_chart2:
-        return pn.Row(selected_chart1, selected_chart2)
-    elif selected_chart1:
-        return selected_chart1
-    elif selected_chart2:
-        return selected_chart2
-    else:
-        return None
+# options1 = ['ALL', 'Choose Your Own', 'Based On Category']
+# select0 = pn.widgets.Select(options=options1, name='Choose what to compare')
+# # maincol.append(select0)
+
+# # Charts
+# charts = []
+# charts.append(final)
+# charts.append(final2)
+# charts.append(final3)
+# charts.append(final4)
+# charts.append(final5)
+# charts.append(final6)
+
+# # Define options for dropdown
+# options = [f'Chart {i+1}' for i in range(len(charts))]
+
+# # Panel widgets
+# select1 = pn.widgets.Select(options=options, name='Select Chart 1')
+# select2 = pn.widgets.Select(options=options, name='Select Chart 2')
+
+# options = ['Altruism', 'Fairness', 'spite', 'trust', 'reciprocity', 'free-riding', 'cooperation']
+# select_widget = pn.widgets.Select(options=options, name='Select a category')
+
+
+# # Define function to update chart
+# def update_chart(value):
+#     if value:
+#         index = int(value.split()[-1]) - 1
+#         return charts[index]
+#     else:
+#         return None
+
+# # Combine dropdown and chart
+# @pn.depends(select1.param.value, select2.param.value)
+# def update_plots(value1, value2):
+#     selected_chart1 = update_chart(value1)
+#     selected_chart2 = update_chart(value2)
+#     if selected_chart1 and selected_chart2:
+#         return pn.Row(selected_chart1, selected_chart2)
+#     elif selected_chart1:
+#         return selected_chart1
+#     elif selected_chart2:
+#         return selected_chart2
+#     else:
+#         return None
     
-# Define functions for each category
-def update_plots_altruism():
-    return pn.Row(final, final5)
+# # Define functions for each category
+# def update_plots_altruism():
+#     return pn.Row(final, final5)
 
-def update_plots_fairness():
-    return pn.Row(final2, final5)
+# def update_plots_fairness():
+#     return pn.Row(final2, final5)
 
-def update_plots_spite():
-    return final
+# def update_plots_spite():
+#     return final
 
-def update_plots_trust():
-    return final4
+# def update_plots_trust():
+#     return final4
 
-def update_plots_reciprocity():
-    return final5
+# def update_plots_reciprocity():
+#     return final5
 
-def update_plots_freeriding():
-    return final6
+# def update_plots_freeriding():
+#     return final6
 
-def update_plots_cooperation():
-    return final6
+# def update_plots_cooperation():
+#     return final6
 
-# Define a dictionary to map categories to update functions
-update_functions = {
-    'Altruism': update_plots_altruism,
-    'Fairness': update_plots_fairness,
-    'spite': update_plots_spite,
-    'trust': update_plots_trust,
-    'reciprocity': update_plots_reciprocity,
-    'freeriding': update_plots_freeriding,
-    'cooperation': update_plots_cooperation
-}
+# # Define a dictionary to map categories to update functions
+# update_functions = {
+#     'Altruism': update_plots_altruism,
+#     'Fairness': update_plots_fairness,
+#     'spite': update_plots_spite,
+#     'trust': update_plots_trust,
+#     'reciprocity': update_plots_reciprocity,
+#     'freeriding': update_plots_freeriding,
+#     'cooperation': update_plots_cooperation
+# }
 
 
+# # # Define function to update chart based on selected category
+# # def update_plots_category(event):
+# #     selected_category = event.new
+# #     maincol.clear()  # Clear existing content in main column
+    
+# #     if selected_category in update_functions:
+# #         update_function = update_functions[selected_category]
+# #         maincol.append(update_function())
+# #     else:
+# #         maincol.append(pn.pane.Markdown(f"No update function found for category: {selected_category}"))
+
 # # Define function to update chart based on selected category
 # def update_plots_category(event):
 #     selected_category = event.new
@@ -805,44 +836,33 @@ update_functions = {
 #         maincol.append(update_function())
 #     else:
 #         maincol.append(pn.pane.Markdown(f"No update function found for category: {selected_category}"))
-
-# Define function to update chart based on selected category
-def update_plots_category(event):
-    selected_category = event.new
-    maincol.clear()  # Clear existing content in main column
-    
-    if selected_category in update_functions:
-        update_function = update_functions[selected_category]
-        maincol.append(update_function())
-    else:
-        maincol.append(pn.pane.Markdown(f"No update function found for category: {selected_category}"))
     
-    # Append select_widget again to allow changing the category selection
-    maincol.append(select_widget)
+#     # Append select_widget again to allow changing the category selection
+#     maincol.append(select_widget)
 
 
-# Callback function to handle select widget events
-def select_callback(event):
-    selected_value = event.new
-    maincol.clear()  # Clear existing content in main column
+# # Callback function to handle select widget events
+# def select_callback(event):
+#     selected_value = event.new
+#     maincol.clear()  # Clear existing content in main column
     
-    if selected_value == 'Choose Your Own':
-        maincol.append(select1)
-        maincol.append(select2)
-        maincol.append(update_plots)
-
-    elif selected_value == 'Based On Category':
-        maincol.append(select_widget)
-        select_widget.param.watch(update_plots_category, 'value')
+#     if selected_value == 'Choose Your Own':
+#         maincol.append(select1)
+#         maincol.append(select2)
+#         maincol.append(update_plots)
+
+#     elif selected_value == 'Based On Category':
+#         maincol.append(select_widget)
+#         select_widget.param.watch(update_plots_category, 'value')
         
-#         # Bind the update_plots_category function to the select widget's 'value' parameter
-#         select.param.watch
-        # maincol.append(update_plots_category())
+# #         # Bind the update_plots_category function to the select widget's 'value' parameter
+# #         select.param.watch
+#         # maincol.append(update_plots_category())
 
-# Bind the callback function to the select widget's 'value' parameter
-select0.param.watch(select_callback, 'value')
+# # Bind the callback function to the select widget's 'value' parameter
+# select0.param.watch(select_callback, 'value')
 
-maincol.append(select0)
+# maincol.append(select0)
 
-template.main.append(maincol)
-template.servable()
+# template.main.append(maincol)
+# template.servable()