projects
/
psensor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bcc4291
)
alarm limit edition using the temperature unit set in the global pref.
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 26 Apr 2012 08:50:57 +0000
(08:50 +0000)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Thu, 26 Apr 2012 08:50:57 +0000
(08:50 +0000)
NEWS
patch
|
blob
|
history
src/glade/sensor-edit.glade
patch
|
blob
|
history
src/lib/psensor.c
patch
|
blob
|
history
src/lib/psensor.h
patch
|
blob
|
history
src/ui_sensorpref.c
patch
|
blob
|
history
diff --git
a/NEWS
b/NEWS
index
46748c9
..
a3f9f60
100644
(file)
--- a/
NEWS
+++ b/
NEWS
@@
-33,6
+33,8
@@
** psensor: added --new-instance option to allow the creation of
multiple instances of Psensor.
** psensor: added the degree sign before the temperature symbols.
** psensor: added --new-instance option to allow the creation of
multiple instances of Psensor.
** psensor: added the degree sign before the temperature symbols.
+** psensor: alarm limit edition using the temperature unit set in the
+ global pref.
* v0.6.2.17
* v0.6.2.17
diff --git
a/src/glade/sensor-edit.glade
b/src/glade/sensor-edit.glade
index
44c43a2
..
5e6e3eb
100644
(file)
--- a/
src/glade/sensor-edit.glade
+++ b/
src/glade/sensor-edit.glade
@@
-321,11
+321,12
@@
</packing>
</child>
<child>
</packing>
</child>
<child>
- <object class="GtkLabel" id="
label9
">
+ <object class="GtkLabel" id="
sensor_temp_unit
">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">start</property>
<property name="xalign">0</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">
°C
</property>
+ <property name="label" translatable="yes">
N/A
</property>
</object>
<packing>
<property name="expand">True</property>
</object>
<packing>
<property name="expand">True</property>
diff --git
a/src/lib/psensor.c
b/src/lib/psensor.c
index
084d0f0
..
89ed97e
100644
(file)
--- a/
src/lib/psensor.c
+++ b/
src/lib/psensor.c
@@
-205,6
+205,11
@@
double celcius_to_fahrenheit(double c)
return c * (9.0/5.0) + 32;
}
return c * (9.0/5.0) + 32;
}
+double fahrenheit_to_celcius(double f)
+{
+ return (f - 32) * (5.0/9.0);
+}
+
char *psensor_value_to_string(unsigned int type,
double value,
int use_celcius)
char *psensor_value_to_string(unsigned int type,
double value,
int use_celcius)
diff --git
a/src/lib/psensor.h
b/src/lib/psensor.h
index
19d3a10
..
7e0c0d6
100644
(file)
--- a/
src/lib/psensor.h
+++ b/
src/lib/psensor.h
@@
-189,6
+189,8
@@
void psensor_cleanup();
double get_max_value(struct psensor **sensors, int type);
double celcius_to_fahrenheit(double c);
double get_max_value(struct psensor **sensors, int type);
double celcius_to_fahrenheit(double c);
+double fahrenheit_to_celcius(double c);
+
void psensor_log_measures(struct psensor **sensors);
void psensor_log_measures(struct psensor **sensors);
diff --git
a/src/ui_sensorpref.c
b/src/ui_sensorpref.c
index
04e6352
..
331fef3
100644
(file)
--- a/
src/ui_sensorpref.c
+++ b/
src/ui_sensorpref.c
@@
-41,7
+41,8
@@
struct cb_data {
struct sensor_pref **prefs;
};
struct sensor_pref **prefs;
};
-static struct sensor_pref *sensor_pref_new(struct psensor *s)
+static struct sensor_pref *sensor_pref_new(struct psensor *s,
+ struct config *cfg)
{
struct sensor_pref *p = malloc(sizeof(struct sensor_pref));
{
struct sensor_pref *p = malloc(sizeof(struct sensor_pref));
@@
-50,9
+51,13
@@
static struct sensor_pref *sensor_pref_new(struct psensor *s)
p->name = strdup(s->name);
p->enabled = s->enabled;
p->alarm_enabled = s->alarm_enabled;
p->name = strdup(s->name);
p->enabled = s->enabled;
p->alarm_enabled = s->alarm_enabled;
- p->alarm_limit = s->alarm_limit;
p->color = color_dup(s->color);
p->color = color_dup(s->color);
+ if (cfg->temperature_unit == CELCIUS)
+ p->alarm_limit = s->alarm_limit;
+ else
+ p->alarm_limit = celcius_to_fahrenheit(s->alarm_limit);
+
return p;
}
return p;
}
@@
-67,7
+72,8
@@
static void sensor_pref_free(struct sensor_pref *p)
free(p);
}
free(p);
}
-static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors)
+static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors,
+ struct config *cfg)
{
int n, i;
struct sensor_pref **pref_list;
{
int n, i;
struct sensor_pref **pref_list;
@@
-76,7
+82,8
@@
static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors)
pref_list = malloc(sizeof(struct sensor_pref *) * (n+1));
for (i = 0; i < n; i++)
pref_list = malloc(sizeof(struct sensor_pref *) * (n+1));
for (i = 0; i < n; i++)
- pref_list[i] = sensor_pref_new(sensors[i]);
+ pref_list[i] = sensor_pref_new(sensors[i],
+ cfg);
pref_list[n] = NULL;
pref_list[n] = NULL;
@@
-224,15
+231,19
@@
static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
}
static void
}
static void
-update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder)
+update_pref(struct psensor *s,
+ struct sensor_pref **prefs,
+ struct config *cfg,
+ GtkBuilder *builder)
{
{
- GtkLabel *w_id, *w_type;
+ GtkLabel *w_id, *w_type
, *w_temp_unit
;
GtkEntry *w_name;
GtkToggleButton *w_draw, *w_alarm;
GtkColorButton *w_color;
GtkSpinButton *w_temp_limit;
GdkColor *color;
struct sensor_pref *p = sensor_pref_get(prefs, s);
GtkEntry *w_name;
GtkToggleButton *w_draw, *w_alarm;
GtkColorButton *w_color;
GtkSpinButton *w_temp_limit;
GdkColor *color;
struct sensor_pref *p = sensor_pref_get(prefs, s);
+ int use_celcius;
w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
gtk_label_set_text(w_id, s->id);
w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
gtk_label_set_text(w_id, s->id);
@@
-258,6
+269,15
@@
update_pref(struct psensor *s, struct sensor_pref **prefs, GtkBuilder *builder)
= GTK_SPIN_BUTTON(gtk_builder_get_object(builder,
"sensor_temp_limit"));
= GTK_SPIN_BUTTON(gtk_builder_get_object(builder,
"sensor_temp_limit"));
+ w_temp_unit
+ = GTK_LABEL(gtk_builder_get_object(builder,
+ "sensor_temp_unit"));
+
+ use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0;
+ gtk_label_set_text(w_temp_unit,
+ psensor_type_to_unit_str(s->type,
+ use_celcius));
+
if (is_temp_type(s->type)) {
gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
gtk_spin_button_set_value(w_temp_limit, p->alarm_limit);
if (is_temp_type(s->type)) {
gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
gtk_spin_button_set_value(w_temp_limit, p->alarm_limit);
@@
-283,7
+303,10
@@
static void on_changed(GtkTreeSelection *selection, gpointer data)
gint *indices = gtk_tree_path_get_indices(p);
struct psensor *s = *(ui->sensors + *indices);
gint *indices = gtk_tree_path_get_indices(p);
struct psensor *s = *(ui->sensors + *indices);
- update_pref(s, cbdata->prefs, cbdata->builder);
+ update_pref(s,
+ cbdata->prefs,
+ ui->config,
+ cbdata->builder);
gtk_tree_path_free(p);
}
gtk_tree_path_free(p);
}
@@
-315,7
+338,9
@@
select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
}
static void
}
static void
-apply_prefs(struct sensor_pref **prefs, struct psensor **sensors)
+apply_prefs(struct sensor_pref **prefs,
+ struct psensor **sensors,
+ struct config *cfg)
{
int n = psensor_list_size(sensors);
int i;
{
int n = psensor_list_size(sensors);
int i;
@@
-335,11
+360,14
@@
apply_prefs(struct sensor_pref **prefs, struct psensor **sensors)
config_set_sensor_enabled(s->id, s->enabled);
}
config_set_sensor_enabled(s->id, s->enabled);
}
- if (
s->alarm_limit != p->alarm_limit) {
+ if (
cfg->temperature_unit == CELCIUS)
s->alarm_limit = p->alarm_limit;
s->alarm_limit = p->alarm_limit;
- config_set_sensor_alarm_limit(s->id,
- s->alarm_limit);
- }
+ else
+ s->alarm_limit = fahrenheit_to_celcius
+ (p->alarm_limit);
+
+ config_set_sensor_alarm_limit(s->id,
+ s->alarm_limit);
if (s->alarm_enabled != p->alarm_enabled) {
s->alarm_enabled = p->alarm_enabled;
if (s->alarm_enabled != p->alarm_enabled) {
s->alarm_enabled = p->alarm_enabled;
@@
-368,7
+396,8
@@
void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
struct cb_data cbdata;
cbdata.ui = ui;
struct cb_data cbdata;
cbdata.ui = ui;
- cbdata.prefs = sensor_pref_list_new(ui->sensors);
+ cbdata.prefs = sensor_pref_list_new(ui->sensors,
+ ui->config);
builder = gtk_builder_new();
cbdata.builder = builder;
builder = gtk_builder_new();
cbdata.builder = builder;
@@
-384,7
+413,7
@@
void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
return ;
}
return ;
}
- update_pref(sensor, cbdata.prefs, builder);
+ update_pref(sensor, cbdata.prefs,
ui->config,
builder);
connect_signals(builder, &cbdata);
w_sensors_list
connect_signals(builder, &cbdata);
w_sensors_list
@@
-419,7
+448,7
@@
void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
result = gtk_dialog_run(diag);
if (result == GTK_RESPONSE_ACCEPT) {
result = gtk_dialog_run(diag);
if (result == GTK_RESPONSE_ACCEPT) {
- apply_prefs(cbdata.prefs, ui->sensors);
+ apply_prefs(cbdata.prefs, ui->sensors
, ui->config
);
ui_sensorlist_update_sensors_preferences(ui);
}
ui_sensorlist_update_sensors_preferences(ui);
}