Skip to content

Commit

Permalink
Update info on GUI and spinboxes
Browse files Browse the repository at this point in the history
  • Loading branch information
@antoine-royer
antoine-royer committed Mar 31, 2023
1 parent 9d27b47 commit 9766608
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
1 change: 1 addition & 0 deletions include/netcdf_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions nevada_data/glade/nevada.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
13 changes: 7 additions & 6 deletions nevada_data/glade/nevada.glade~
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/callbacks.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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();

}
8 changes: 4 additions & 4 deletions src/netcdf_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 9766608

Please sign in to comment.