AliceTt commited on
Commit
f0b11dd
·
1 Parent(s): e25f53d

added formatting of buttons

Browse files
Files changed (2) hide show
  1. app.py +23 -7
  2. func_utils.py +5 -0
app.py CHANGED
@@ -144,7 +144,10 @@ with gr.Blocks() as demo:
144
  color: #000000 !important;
145
  }
146
  button.svelte-1tcem6n.svelte-1tcem6n:hover:not(:disabled):not(.selected) {
147
- background-color: linear-gradient(#28C896, #96E600);
 
 
 
148
  }
149
  .primary.svelte-1ixn6qd{
150
  background: #FFFFFF;
@@ -155,12 +158,17 @@ with gr.Blocks() as demo:
155
  border-color: #000000;
156
  }
157
  .primary.svelte-1ixn6qd:hover,.primary[disabled].svelte-1ixn6qd {
158
- background: #28C896;
159
  }
160
  .primary.svelte-1ixn6qd:hover {
161
  border-color: #000000;
162
  border-shadow: #000000;
163
  }
 
 
 
 
 
164
  </style>
165
  """
166
  )
@@ -205,7 +213,7 @@ with gr.Blocks() as demo:
205
  value="Réinitialiser la localisation",
206
  size="md",
207
  elem_classes=["back-button"],
208
- variant="primary"
209
  )
210
 
211
  with gr.Row(elem_classes=["card"]):
@@ -213,7 +221,11 @@ with gr.Blocks() as demo:
213
  label="Culture",
214
  scale=1,
215
  elem_classes="culture_box",
216
- choices=["Blé", "Colza", "Orge"],
 
 
 
 
217
  )
218
 
219
  with gr.Column(variant="panel", scale=3):
@@ -224,7 +236,10 @@ with gr.Blocks() as demo:
224
  )
225
 
226
  go_to_page_2_btn = gr.Button(
227
- "Aller aux résultats", visible=False, elem_classes=["ok-button"], variant="primary"
 
 
 
228
  )
229
 
230
  page_2 = gr.Column(visible=False)
@@ -237,7 +252,7 @@ with gr.Blocks() as demo:
237
  value="Retour",
238
  size="md",
239
  elem_classes=["back-button"],
240
- variant="primary"
241
  )
242
  with gr.Row(equal_height=True, elem_classes="result-page"):
243
  with gr.Tab(label="Prévisions climatiques", scale=1):
@@ -289,7 +304,7 @@ with gr.Blocks() as demo:
289
  gr.Plot()
290
  with gr.Column():
291
  gr.HTML("<h2 style='color: #000000'>Rendements</h2>")
292
- gr.Plot()
293
 
294
  demo.load(on_init, [lat, lon, address], [lat, lon, map])
295
  place_btn.click(on_init, [lat, lon, address], [lat, lon, map])
@@ -314,6 +329,7 @@ with gr.Blocks() as demo:
314
  plot_1,
315
  plot_2,
316
  plot_3,
 
317
  page_1,
318
  page_2,
319
  go_to_page_2_btn,
 
144
  color: #000000 !important;
145
  }
146
  button.svelte-1tcem6n.svelte-1tcem6n:hover:not(:disabled):not(.selected) {
147
+ background-color: #28C896;
148
+ }
149
+ textarea.svelte-173056l.svelte-173056l {
150
+ color: #000000 !important;
151
  }
152
  .primary.svelte-1ixn6qd{
153
  background: #FFFFFF;
 
158
  border-color: #000000;
159
  }
160
  .primary.svelte-1ixn6qd:hover,.primary[disabled].svelte-1ixn6qd {
161
+ background: #3f3f46;
162
  }
163
  .primary.svelte-1ixn6qd:hover {
164
  border-color: #000000;
165
  border-shadow: #000000;
166
  }
167
+ .secondary.svelte-1ixn6qd:hover,.secondary[disabled].svelte-1ixn6qd {
168
+ background: var(--button-secondary-background-fill-hover);
169
+ color: var(--button-secondary-text-color-hover)
170
+ }
171
+
172
  </style>
173
  """
174
  )
 
213
  value="Réinitialiser la localisation",
214
  size="md",
215
  elem_classes=["back-button"],
216
+ variant="primary",
217
  )
218
 
219
  with gr.Row(elem_classes=["card"]):
 
221
  label="Culture",
222
  scale=1,
223
  elem_classes="culture_box",
224
+ choices=[
225
+ "Blé tendre d'hiver",
226
+ "Colza d'hiver",
227
+ "Orge d'hiver",
228
+ ],
229
  )
230
 
231
  with gr.Column(variant="panel", scale=3):
 
236
  )
237
 
238
  go_to_page_2_btn = gr.Button(
239
+ "Aller aux résultats",
240
+ visible=False,
241
+ elem_classes=["ok-button"],
242
+ variant="primary",
243
  )
244
 
245
  page_2 = gr.Column(visible=False)
 
252
  value="Retour",
253
  size="md",
254
  elem_classes=["back-button"],
255
+ variant="primary",
256
  )
257
  with gr.Row(equal_height=True, elem_classes="result-page"):
258
  with gr.Tab(label="Prévisions climatiques", scale=1):
 
304
  gr.Plot()
305
  with gr.Column():
306
  gr.HTML("<h2 style='color: #000000'>Rendements</h2>")
307
+ shaded_plot_yields = gr.Plot()
308
 
309
  demo.load(on_init, [lat, lon, address], [lat, lon, map])
310
  place_btn.click(on_init, [lat, lon, address], [lat, lon, map])
 
329
  plot_1,
330
  plot_2,
331
  plot_3,
332
+ shaded_plot_yields,
333
  page_1,
334
  page_2,
335
  go_to_page_2_btn,
func_utils.py CHANGED
@@ -3,6 +3,7 @@ import requests
3
  import gradio as gr
4
 
5
 
 
6
  from visualize.visualize import get_plots
7
 
8
 
@@ -72,12 +73,16 @@ def launch_simulation(lat, lon, address, culture):
72
  agripv_summary = "bidule"
73
  page1, page_2 = go_to_page_2()
74
  plot_1, plot_2, plot_3 = get_plots()
 
 
 
75
  return (
76
  current_situation_summary,
77
  agripv_summary,
78
  plot_1,
79
  plot_2,
80
  plot_3,
 
81
  page1,
82
  page_2,
83
  gr.Button(visible=True),
 
3
  import gradio as gr
4
 
5
 
6
+ from compute_yield import plot_yield
7
  from visualize.visualize import get_plots
8
 
9
 
 
73
  agripv_summary = "bidule"
74
  page1, page_2 = go_to_page_2()
75
  plot_1, plot_2, plot_3 = get_plots()
76
+ shaded_plot_yields = plot_yield(
77
+ latitude=lat, longitude=lon, culture=culture, shading_coef=0.2
78
+ )
79
  return (
80
  current_situation_summary,
81
  agripv_summary,
82
  plot_1,
83
  plot_2,
84
  plot_3,
85
+ shaded_plot_yields,
86
  page1,
87
  page_2,
88
  gr.Button(visible=True),