From 9766608f8a449889a1a24e915d8ee0bdaca380ae Mon Sep 17 00:00:00 2001
From: Shadow15510 <antoine.royer14@orange.fr>
Date: Fri, 31 Mar 2023 21:08:29 +0200
Subject: [PATCH] Update info on GUI and spinboxes

---
 include/netcdf_api.h            |  1 +
 nevada_data/glade/nevada.glade  | 14 +++++++-------
 nevada_data/glade/nevada.glade~ | 13 +++++++------
 src/callbacks.c                 |  4 ++--
 src/netcdf_api.c                |  8 ++++----
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/include/netcdf_api.h b/include/netcdf_api.h
index 8f1c52f..6c492b2 100644
--- a/include/netcdf_api.h
+++ b/include/netcdf_api.h
@@ -5,6 +5,7 @@
 // netcdf_get_variables : récupère les variables du fichier donné et met à jour la combo box
 void netcdf_get_variables(const char *filename);
 
+// netcdf_set_fits : adapte les bornes des valeurs minimales et maximales en fonction de la variable
 void netcdf_set_fits(const char *filename, const char *var);
 
 // netcdf_get_dim : extrait les dimensions des axes et la date
diff --git a/nevada_data/glade/nevada.glade b/nevada_data/glade/nevada.glade
index a2fa8c9..c56585f 100644
--- a/nevada_data/glade/nevada.glade
+++ b/nevada_data/glade/nevada.glade
@@ -59,22 +59,18 @@
     </patterns>
   </object>
   <object class="GtkAdjustment" id="fit_x_max">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="fit_x_min">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="fit_y_max">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="fit_y_min">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
@@ -371,7 +367,7 @@
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Facteur x</property>
+                        <property name="label" translatable="yes">facteur x</property>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>
@@ -382,7 +378,7 @@
                       <object class="GtkSpinButton" id="spin_factor_x">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
-                        <property name="tooltip-text" translatable="yes">Facteur à appliquer sur les abcsisses</property>
+                        <property name="tooltip-text" translatable="yes">Facteur à appliquer sur les abcisses</property>
                         <property name="text" translatable="yes">1,00</property>
                         <property name="adjustment">facteur_x</property>
                         <property name="climb-rate">0.10</property>
@@ -398,7 +394,7 @@
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Facteur y</property>
+                        <property name="label" translatable="yes">facteur y</property>
                       </object>
                       <packing>
                         <property name="left-attach">2</property>
@@ -469,6 +465,7 @@
                       <object class="GtkSpinButton" id="spin_x_max">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur maximale pour les abcisses</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_x_max</property>
                         <property name="climb-rate">0.10</property>
@@ -482,6 +479,7 @@
                       <object class="GtkSpinButton" id="spin_y_min">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur minimale pour les ordonnées</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_y_min</property>
                         <property name="climb-rate">0.10</property>
@@ -495,6 +493,7 @@
                       <object class="GtkSpinButton" id="spin_y_max">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur maximale pour les ordonnées</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_y_max</property>
                         <property name="climb-rate">0.10</property>
@@ -508,6 +507,7 @@
                       <object class="GtkSpinButton" id="spin_x_min">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur minimale pour les abcisses</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_x_min</property>
                         <property name="climb-rate">0.10</property>
diff --git a/nevada_data/glade/nevada.glade~ b/nevada_data/glade/nevada.glade~
index 6b1858d..7389356 100644
--- a/nevada_data/glade/nevada.glade~
+++ b/nevada_data/glade/nevada.glade~
@@ -59,22 +59,18 @@
     </patterns>
   </object>
   <object class="GtkAdjustment" id="fit_x_max">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="fit_x_min">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="fit_y_max">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="fit_y_min">
-    <property name="upper">100</property>
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
@@ -301,6 +297,7 @@
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="tooltip-text" translatable="yes">Variable à analyser</property>
+                            <signal name="changed" handler="on_combo_vars_changed" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -370,7 +367,7 @@
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Facteur x</property>
+                        <property name="label" translatable="yes">facteur x</property>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>
@@ -397,7 +394,7 @@
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Facteur y</property>
+                        <property name="label" translatable="yes">facteur y</property>
                       </object>
                       <packing>
                         <property name="left-attach">2</property>
@@ -468,6 +465,7 @@
                       <object class="GtkSpinButton" id="spin_x_max">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur maximale pour les abcisses</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_x_max</property>
                         <property name="climb-rate">0.10</property>
@@ -481,6 +479,7 @@
                       <object class="GtkSpinButton" id="spin_y_min">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur minimale pour les ordonnées</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_y_min</property>
                         <property name="climb-rate">0.10</property>
@@ -494,6 +493,7 @@
                       <object class="GtkSpinButton" id="spin_y_max">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur maximale pour les ordonnées</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_y_max</property>
                         <property name="climb-rate">0.10</property>
@@ -507,6 +507,7 @@
                       <object class="GtkSpinButton" id="spin_x_min">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="tooltip-text" translatable="yes">Valeur minimale pour les abcisses</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">fit_x_min</property>
                         <property name="climb-rate">0.10</property>
diff --git a/src/callbacks.c b/src/callbacks.c
index a64b6f0..0d096ee 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -147,7 +147,7 @@ G_MODULE_EXPORT void on_button_validation_clicked(void)
 	GtkLabel *label_status = GTK_LABEL(gtk_builder_get_object(builder, "label_status"));
 	gtk_label_set_text(label_status, "en cours de traitement");
 	gtk_main_iteration();
-	sleep(0.1);
+	sleep(0.2);
 	gtk_main_iteration();
 
 	struct netcdf_data netcdf_data = {
@@ -187,7 +187,7 @@ G_MODULE_EXPORT void on_button_validation_clicked(void)
 	// Mise à jour du statut
 	gtk_label_set_text(label_status, "en attente de validation");
 	gtk_main_iteration();
-	sleep(0.1);
+	sleep(0.2);
 	gtk_main_iteration();
 
 }
\ No newline at end of file
diff --git a/src/netcdf_api.c b/src/netcdf_api.c
index f8b027e..9e8bdc1 100644
--- a/src/netcdf_api.c
+++ b/src/netcdf_api.c
@@ -32,16 +32,16 @@ void netcdf_get_variables(const char *filename)
 	}
 
 	GtkAdjustment *fit_x_min = GTK_ADJUSTMENT(gtk_builder_get_object(builder, "fit_x_min"));
-	gtk_adjustment_configure(fit_x_min, 0, 0, 100, 1, 10, 0);
+	gtk_adjustment_configure(fit_x_min, 0, 0, 0, 1, 10, 0);
 
 	GtkAdjustment *fit_x_max = GTK_ADJUSTMENT(gtk_builder_get_object(builder, "fit_x_max"));
-	gtk_adjustment_configure(fit_x_max, 0, 0, 100, 1, 10, 0);
+	gtk_adjustment_configure(fit_x_max, 0, 0, 0, 1, 10, 0);
 
 	GtkAdjustment *fit_y_min = GTK_ADJUSTMENT(gtk_builder_get_object(builder, "fit_y_min"));
-	gtk_adjustment_configure(fit_y_min, 0, 0, 100, 1, 10, 0);
+	gtk_adjustment_configure(fit_y_min, 0, 0, 0, 1, 10, 0);
 
 	GtkAdjustment *fit_y_max = GTK_ADJUSTMENT(gtk_builder_get_object(builder, "fit_y_max"));
-	gtk_adjustment_configure(fit_y_max, 0, 0, 100, 1, 10, 0);
+	gtk_adjustment_configure(fit_y_max, 0, 0, 0, 1, 10, 0);
 
 	nc_close(ncid);
 }