[tuxdroid-svn] r600 - in software/gadgets/battery_monitor/trunk: . Battery_monitor_svn Battery_moni
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r600 - in software/gadgets/battery_monitor/trunk: . Battery_monitor_svn Battery_monitor_svn/Scripts/Python Battery_monitor_svn/Scripts/Python/GUI/conf Battery_monitor_svn/Scripts/Python/GUI/widget Battery_monitor_svn/Strings
Author: Paul_R
Date: 2007-10-10 17:04:47 +0200 (Wed, 10 Oct 2007)
New Revision: 600
Modified:
software/gadgets/battery_monitor/trunk/Battery_monitor.tgf
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.glade
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/widget/other.glade
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/widget/other.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/about.xml
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/settings.xml
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/strings.xml
Log:
* Change the previous battery_monitor to accord with the last changes made in
the light_monitor gadget
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor.tgf
===================================================================
(Binary files differ)
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py 2007-10-10 13:52:16 UTC (rev 599)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py 2007-10-10 15:04:47 UTC (rev 600)
@@ -34,7 +34,7 @@
context.rectangle(rect.x, rect.y, rect.width, rect.height)
#set a white background
context.set_source_rgb(1, 1, 1)
- context.fill_preserve()
+ context.fill()
#draw a black border
context.set_source_rgb(0, 0, 0)
context.set_line_width(1)
@@ -56,16 +56,9 @@
context.set_line_width(0.6)
context.line_to(0, y)
context.set_source_rgb(0.2, 0.2, 0.2)
- context.show_text(str((10-(i/2))*10)+"%")
+ if i != 18:
+ context.show_text(str(6.5 - (0.125 * i))+' V')
context.stroke()
-
- #draw the threshold line
- if self.measure_graph.threshold_chk == True:
- context.set_source_rgb(0,0,1)
- context.set_line_width(0.9)
- context.move_to(0, rect.height - (rect.height * (self.measure_graph.val_threshold / 100.0)))
- context.line_to(rect.width, rect.height - (rect.height * (self.measure_graph.val_threshold / 100.0)))
- context.stroke()
#draw vertical division
#create a tab with the wanted divisions
@@ -86,55 +79,58 @@
#display sample and rate
#move the vector in the bottom
- context.move_to(10, rect.height - 10)
+ context.move_to(5, rect.height - 10)
#display the rate
context.show_text("rate = "+str(self.measure_graph.rate)+" sec.")
- context.move_to(10, rect.height - 20)
+ context.move_to(5, rect.height - 20)
#and the samples
context.show_text("samples = "+str(self.measure_graph.sample))
context.stroke()
#determine the coefficients to adjust the curve in the window space
- coeff_y = float(rect.height / 1024.00)
+ coeff_y = float(rect.height / 340.00)
coeff_x = float(rect.width / (self.measure_graph.sample - 1))
-
- #trace the curve
- context.move_to(rect.x, rect.height)
- context.set_source_rgb(1.0, 0, 0)
+
+ #Fill...
+ context.set_line_width(0.6)
+ context.set_source_rgb(0, 0, 1)
+ context.move_to(rect.x - 2, rect.height + 2)
+ context.line_to(rect.x, rect.height - (self.measure_graph.val_table[0] * coeff_y))
for i, val in enumerate(self.measure_graph.val_table):
context.line_to(rect.x + ((i) * coeff_x), rect.height - (val * coeff_y))
+ context.line_to(rect.x + ((i) * coeff_x), rect.height + 5)
+ context.close_path()
+ context.set_source_rgba(1.0, 0, 0, 0.2)
+ context.fill()
+
+ #and trace the curce
+ context.set_line_width(0.6)
+ context.set_source_rgb(1, 0, 0)
+ context.move_to(rect.x - 2, rect.height + 2)
+ context.line_to(rect.x, rect.height - (self.measure_graph.val_table[0] * coeff_y))
+ for i, val in enumerate(self.measure_graph.val_table):
+ context.line_to(rect.x + ((i) * coeff_x), rect.height - (val * coeff_y))
+ context.line_to(rect.x + ((i) * coeff_x), rect.height + 5)
context.stroke()
class Measure():
def __init__(self):
#Initial value
self.sample = 500.0
- self.val_table = [0] * int(self.sample + 1)
- self.value = 0
- self.timecontrol = time.time()
+ self.sample_backup = self.sample
+ self.val_table = [-2] * int(self.sample + 1)
+ self.test_tab = [0]
self.rate = 1.0
- self.threshold_chk = False
-
- self.increase = False
- self.decrease = False
- self.both = False
- self.drop = False
- self.raising = False
- self.changeD = False
- self.changeU = False
-
- #Events flags
- self.threshold_event = False
- self.change_event = False
-
- self.GUI_on = False
- self.notify = True
-
- self.timeout = 0
+ self.rate_backup = self.rate
+ self.tick = time.time() + self.rate
+ self.average = 0
+ self.count = 0
+ self.GUI_on = False
self.start_flag = True
- self.wait = 0
- #self.temp = 1124
- self.ok_flag = False
+ self.wait = time.time() + 2.0
+
+
+
self.__on_battery_mutex = threading.Lock()
self.__timeout_mutex = threading.Lock()
@@ -145,88 +141,73 @@
#
###########################################################
def event_control(self):
- if self.GUI_on == False:
- for i in range (len(self.event_tab)):
- self.Threshold_control(i)
- self.Change_control(i)
+ if self.GUI_on:
+ self.__tab = self.test_tab
+ else:
+ self.__tab = self.event_tab
+
+ for i in range (len(self.__tab)):
+ self.Threshold_control(i)
+ self.Change_control(i)
- #Gadget or test notifications
- else:
- self.test_func()
- #disable gadget notifications
- self.notify = False
-
+ if self.GUI_on:
+ self.test_tab = self.__tab
+ else:
+ self.event_tab = self.__tab
+
+ if self.GUI_on:
#goto test notification every sec.
- if self.wait == 0:
- self.wait = 10
+ if self.wait <= time.time():
+ self.wait = time.time() + 2.0
self.test_notification()
- else:
- self.wait -= 1
+
# To prevent notifications at startup
if self.start_flag == True:
- self.change_event = False
- self.threshold_event = False
+ self.test_tab[0][7] = False
self.start_flag = False
for i in range (len(self.event_tab)):
self.event_tab[i][7] = False
-
- def change_control(self):
- # Determine how many point must be checked for changes events
- pts_per_sec = self.sample / (self.rate * self.sample)
-
- if self.val_drop_time >= 0.1 and self.val_drop > 0:
- self.drop_point = int(self.val_drop_time * pts_per_sec)
- self.set_timeout(self.drop_point)
- if self.val_raise_time >= 0.1 and self.val_raise > 0:
- self.raise_point = int(self.val_raise_time * pts_per_sec)
- self.set_timeout(self.raise_point)
- if self.val_changeD_time >= 0.1 and self.val_changeD > 0:
- self.changeD_point = int(self.val_changeD_time * pts_per_sec)
- self.set_timeout(self.changeD_point)
- if self.val_changeU_time >= 0.1 and self.val_changeU > 0:
- self.changeU_point = int(self.val_changeU_time * pts_per_sec)
- self.set_timeout(self.changeU_point)
-
+
###########################################################
#
# Threshold control
#
###########################################################
def Threshold_control(self, index):
- if self.event_tab[index][1] == 1:
- if self.event_tab[index][7] != True:
- if self.event_tab[index][2] == 0:
+ if self.__tab[index][1] == 1:
+ if self.__tab[index][7] != True:
+ if self.__tab[index][2] == 0:
#Increasing threshold control
- if self.Increase_control(self.event_tab[index][3]) == True:
- self.event_tab[index][7] = True
- elif self.event_tab[index][2] == 1:
+ if self.Increase_control(self.__tab[index][3]) == True:
+ self.__tab[index][7] = True
+ elif self.__tab[index][2] == 1:
#Decreasing threshold control
- if self.Decrease_control(self.event_tab[index][3]) == True:
- self.event_tab[index][7] = True
- elif self.event_tab[index][2] == 2:
+ if self.Decrease_control(self.__tab[index][3]) == True:
+ self.__tab[index][7] = True
+ elif self.__tab[index][2] == 2:
#Both direction theshold control
- if self.Both_control(self.event_tab[index][3]) == True:
- self.event_tab[index][7] = True
+ if self.Both_control(self.__tab[index][3]) == True:
+ self.__tab[index][7] = True
def Increase_control(self, value):
- val_act = (self.val_table[len(self.val_table)-1]*100) / 1024.0
- val_prev = (self.val_table[len(self.val_table)-2]*100) / 1024.0
+ val_act = (self.val_table[len(self.val_table)-1]*100) / 1124.0
+ val_prev = (self.val_table[len(self.val_table)-2]*100) / 1124.0
if val_prev <= value and val_act > value:
return True
def Decrease_control(self, val):
- val_act = (self.val_table[len(self.val_table)-1]*100) / 1024.0
- val_prev = (self.val_table[len(self.val_table)-2]*100) / 1024.0
+ val_act = (self.val_table[len(self.val_table)-1]*100) / 1124.0
+ val_prev = (self.val_table[len(self.val_table)-2]*100) / 1124.0
if val_prev >= val and val_act < val:
return True
def Both_control(self, val):
- val_act = (self.val_table[int(len(self.val_table)-1)]*100) / 1024.0
- val_prev = (self.val_table[int(len(self.val_table)-2)]*100) / 1024.0
+ val_act = (self.val_table[int(len(self.val_table)-1)]*100) / 1124.0
+ val_prev = (self.val_table[int(len(self.val_table)-2)]*100) / 1124.0
if val_prev <= val and val_act > val or val_prev >= val and val_act < val:
return True
@@ -238,96 +219,64 @@
###########################################################
def Change_control(self, i):
#Changements control
- if self.event_tab[i][1] == 0:
+ if self.__tab[i][1] == 0:
pts_per_sec = self.sample / (self.rate * self.sample)
- time = int(self.event_tab[i][4] * pts_per_sec)
- if self.event_tab[i][7] != True:
+ time = int(self.__tab[i][4] * pts_per_sec)
+ if self.__tab[i][7] != True:
# Drop change part :
- if self.event_tab[i][2] == 0:
- if self.Drop_control(time, self.event_tab[i][3], self.event_tab[i][8], i) == True:
- self.event_tab[i][7] = True
+ if self.__tab[i][2] == 0:
+ if self.Drop_control(time, self.__tab[i][3], self.__tab[i][8], i) == True:
+ self.__tab[i][7] = True
# Raise change part
- if self.event_tab[i][2] == 1:
- if self.Raise_control(time, self.event_tab[i][3], self.event_tab[i][8], i) == True:
- self.event_tab[i][7] = True
+ if self.__tab[i][2] == 1:
+ if self.Raise_control(time, self.__tab[i][3], self.__tab[i][8], i) == True:
+ self.__tab[i][7] = True
# Drop and Raise change
- if self.event_tab[i][2] == 2:
- if self.ChangeD_control(time, self.event_tab[i][3], self.event_tab[i][8], i) == True:
- self.event_tab[i][7] = True
+ if self.__tab[i][2] == 2:
+ if self.ChangeD_control(time, self.__tab[i][3], self.__tab[i][8], i) == True:
+ self.__tab[i][7] = True
# Raise and Drop change
- if self.event_tab[i][2] == 3:
- if self.ChangeU_control(time, self.event_tab[i][3], self.event_tab[i][8], i) == True:
- self.event_tab[i][7] = True
-
+ if self.__tab[i][2] == 3:
+ if self.ChangeU_control(time, self.__tab[i][3], self.__tab[i][8], i) == True:
+ self.__tab[i][7] = True
+
+
def Drop_control(self, time, val, timeout, index):
#timeout control : to prevent multiple notifications with the same event
if timeout != 0:
timeout -= 1
init_val = len(self.val_table) - 1 - int(time) + timeout
- try:
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
- except:
- init_val = len(self.val_table) - 1 - int(time)
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
-
- if maximum >= self.val_table[len(self.val_table)-1] + ((val/100)*1024):
- if self.GUI_on == False:
- self.event_tab[index][8] = int(time)
- else:
- self.set_timeout(int(time))
+ maximum = max(self.val_table[init_val:len(self.val_table)-1])
+
+ if maximum >= self.val_table[len(self.val_table)-1] + ((val/100)*1124):
+ self.__tab[index][8] = int(time)
return True
else:
- if self.GUI_on:
- self.set_timeout(timeout)
- else:
- self.event_tab[index][8] = timeout
+ self.__tab[index][8] = timeout
def Raise_control(self, time, val, timeout, index):
if timeout != 0:
timeout -= 1
- init_val = len(self.val_table) - 1 - int(time) + timeout
- try:
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
- except:
- init_val = len(self.val_table) - 1 - int(time)
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
-
+ init_val = len(self.val_table) - 1 - int(time) + timeout
minimum = min(self.val_table[init_val:(len(self.val_table)-1)])
- if minimum <= self.val_table[len(self.val_table)-1] - ((val/100)*1024):
- if self.GUI_on == False:
- self.event_tab[index][8] = int(time)
- else:
- self.set_timeout(int(time))
+ if minimum <= self.val_table[len(self.val_table)-1] - ((val/100)*1124):
+ self.__tab[index][8] = int(time)
return True
else:
- if self.GUI_on:
- self.set_timeout(timeout)
- else:
- self.event_tab[index][8] = timeout
+ self.__tab[index][8] = timeout
def ChangeD_control(self, time, val, timeout, index):
if timeout != 0:
timeout -= 1
init_val = len(self.val_table) - 1 - int(time) + timeout
- try:
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
- except:
- init_val = len(self.val_table) - 1 - int(time)
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
-
+ maximum = max(self.val_table[init_val:len(self.val_table)-1])
for i in range(int(time - timeout)):
- if self.val_table[int(len(self.val_table)-1-i)] <= self.val_table[len(self.val_table) - 1] - ((val/100)*1024):
+ if self.val_table[int(len(self.val_table)-1-i)] <= self.val_table[len(self.val_table) - 1] - ((val/100)*1124):
maximum = max(self.val_table[init_val:len(self.val_table) - i])
if maximum >= self.val_table[len(self.val_table) - 1 - i] + val:
- if self.GUI_on == False:
- self.event_tab[index][8] = int(time)
- else:
- self.set_timeout(int(time))
+ self.__tab[index][8] = int(time)
return True
- if self.GUI_on:
- self.set_timeout(timeout)
- else:
- self.event_tab[index][8] = timeout
+ self.__tab[index][8] = timeout
return False
@@ -335,25 +284,14 @@
if timeout != 0:
timeout -= 1
init_val = len(self.val_table) - 1 - int(time) + timeout
- try:
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
- except:
- init_val = len(self.val_table) - 1 - int(time)
- maximum = max(self.val_table[init_val:len(self.val_table)-1])
-
+ maximum = max(self.val_table[init_val:len(self.val_table)-1])
for i in range(int(time - timeout)):
- if self.val_table[int(len(self.val_table)-1-i)] >= self.val_table[len(self.val_table) - 1] + ((val/100)*1024):
+ if self.val_table[int(len(self.val_table)-1-i)] >= self.val_table[len(self.val_table) - 1] + ((val/100)*1124):
minimum = min(self.val_table[init_val:len(self.val_table)-i])
if minimum <= self.val_table[len(self.val_table) - 1 - i] - val:
- if self.GUI_on == False:
- self.event_tab[index][8] = int(time)
- else:
- self.set_timeout(int(time))
+ self.__tab[index][8] = int(time)
return True
- if self.GUI_on:
- self.set_timeout(timeout)
- else:
- self.event_tab[index][8] = timeout
+ self.__tab[index][8] = timeout
return False
@@ -362,107 +300,76 @@
# Test functions
#
###########################################################
- def test_func(self):
- if self.threshold_event != True:
- #Decrease threshold control
- if self.decrease:
- if self.Decrease_control(self.val_threshold) == True:
- self.threshold_event = True
- #Increasing threshold control
- if self.increase:
- if self.Increase_control(self.val_threshold) == True:
- self.threshold_event = True
- #Both direction theshold control
- if self.both:
- if self.Both_control(self.val_threshold) == True:
- self.threshold_event = True
-
- #Changements control
- if self.change_event != True:
- timeout = self.get_timeout()
- # Drop change part :
- if self.drop == True and self.val_drop_time > 0.0:
- if self.Drop_control(self.drop_point, self.val_drop, timeout, 0) == True:
- self.change_event = True
- # Raise change part
- if self.raising == True and self.val_raise_time > 0.0:
- if self.Raise_control(self.raise_point, self.val_raise, timeout, 0) == True:
- self.change_event = True
- # Drop and Raise change
- if self.changeD == True and self.val_changeD_time > 0.0:
- if self.ChangeD_control(self.changeD_point, self.val_changeD, timeout, 0) == True:
- self.change_event = True
- # Raise and Drop change
- if self.changeU == True and self.val_changeU_time > 0.0:
- if self.ChangeU_control(self.changeU_point, self.val_changeU, timeout, 0) == True:
- self.change_event = True
-
-
def test_notification(self):
- if self.threshold_event == True:
- if self.threshold_notified:
- path = self.change_behavior
- path = "'%s'" % path
- if self.threshold_behavior_chk and os.path.isfile(self.threshold_behavior) and os.path.exists(self.threshold_behavior):
- self.threshold_event = False
+ if self.test_tab[0][7] == True:
+ self.test_tab[0][7] = False
+ if self.test_tab[0][5] == True:
+ path = self.test_tab[0][6]
+ path = path.replace('%20', ' ')
+ if os.path.isfile(path) and os.path.exists(path):
+ path = self.test_tab[0][6]
+ path = "'%s'" % path
tux.sys.shell_free(path)
- else:
- self.threshold_event = False
- thread.start_new_thread(self.test_default_behavior, (self.thresholdtext,))
- else:
- self.threshold_event = False
-
- elif self.change_event == True:
- if self.change_notified:
- path = self.change_behavior
- path = "'%s'" % path
- if self.change_behavior_chk and os.path.isfile(self.change_behavior) and os.path.exists(self.change_behavior):
- self.change_event = False
- tux.sys.shell_free(path)
- else:
- self.change_event = False
+ elif self.test_tab[0][1] == 0:
thread.start_new_thread(self.test_default_behavior, (self.changetext,))
- else:
- self.change_event = False
-
+ elif self.test_tab[0][1] == 1:
+ thread.start_new_thread(self.test_default_behavior, (self.thresholdtext,))
+
def test_default_behavior(self, txt):
tux.cmd.mouth_open()
tux.tts.speak(txt)
tux.cmd.mouth_close()
-
-
+
###########################################################
#
# Acquire
#
###########################################################
def on_battery_level(self, args):
- self.__on_battery_mutex.acquire()
- if self.timecontrol <= time.time():
- self.timecontrol = time.time() + self.rate
- val = (args[0] * 256) + args[1]
- self.val_table.append(val)
- self.val_table.pop(0)
- if self.GUI_on:
- self.graph_measure.refresh()
- self.event_control()
- self.__on_battery_mutex.release()
+ try:
+ print 'battery received'
+ self.__on_battery_mutex.acquire()
+ self.average += (args[0] * 256) + args[1]
+ self.count += 1
+ if self.sample_backup != self.sample:
+ self.sample = self.sample_backup
+ self.val_table = [-2] * int(self.sample)
+ if self.rate_backup != self.rate:
+ self.rate_has_changed()
+
+ if self.tick <= time.time():
+ print self.average
+ self.tick = time.time() + self.rate
+ val = self.average / self.count
+ val = val - 530
+ self.val_table.append(val)
+ self.val_table.pop(0)
+ self.average = 0
+ self.count = 0
+ if self.GUI_on:
+ self.graph_measure.refresh()
+ self.event_control()
+ self.__on_battery_mutex.release()
+ except:
+ print sys.exc_info()
-
- ###########################################################
- #
- # Timeout management
- #
- ###########################################################
- def set_timeout(self, val):
- self.__timeout_mutex.acquire()
- self.timeout = val
- self.__timeout_mutex.release()
-
- def get_timeout(self):
- self.__timeout_mutex.acquire()
- val = self.timeout
- self.__timeout_mutex.release()
- return val
+ def rate_has_changed(self):
+ self.rate = self.rate_backup
+ pts_per_sec = self.sample / (self.rate * self.sample)
+ for i in range(len(self.event_tab)):
+ if self.event_tab[i][1] == 0:
+ if self.event_tab[i][4] <= self.rate:
+ self.event_tab[i][4] = self.rate
+ elif self.event_tab[i][4] >= self.rate * self.sample:
+ self.event_tab[i][4] = self.rate * self.sample
+ self.event_tab[i][8] = int(self.event_tab[i][4] * pts_per_sec)
+ if self.test_tab[0][1] == 0:
+ if self.test_tab[0][4] <= self.rate:
+ self.test_tab[0][4] = self.rate
+ elif self.test_tab[0][4] >= self.rate * self.sample:
+ self.test_tab[0][4] = self.rate * self.sample
+ self.test_tab[0][8] = int(self.test_tab[0][4] * pts_per_sec)
+ self.test_tab[0][8] = int(self.test_tab[0][4] * pts_per_sec)
+
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.glade
===================================================================
(Binary files differ)
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp 2007-10-10 13:52:16 UTC (rev 599)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp 2007-10-10 15:04:47 UTC (rev 600)
@@ -10,10 +10,14 @@
def new(self):
self.measure = _me.get_param('measure')
- _me.insert_funct('refresh_tree', self.refresh_tree)
+ _me.insert_funct('refresh_tree', self.refresh_tree)
+ _me.insert_funct('verify_tab', self.verify_tab)
self.updates_commons()
self.make_viewtree()
self.update_labels()
+
+
+
def updates_commons(self):
# Window title
@@ -60,7 +64,7 @@
###########################################################
#
- # Light configuration control
+ # Battery configuration control
#
###########################################################
def make_viewtree(self):
@@ -120,7 +124,8 @@
self.get_widget('cbb_conf_event').set_active(0)
self.get_widget('txt_conf_value').set_text('1.0')
self.get_widget('txt_conf_time').set_text('0.1')
- self.gadget_viewer.connect("row_activated", self.on_row_selected)
+ self.gadget_viewer.get_selection().connect("changed",self.on_row_selected)
+ #self.gadget_viewer.connect("row_activated", self.on_row_selected)
self.measure.event_tab = _me.get_param('config')
self.get_widget('cbb_conf_event').append_text(_me.string('conf_lblChange'))
self.get_widget('cbb_conf_event').append_text(_me.string('conf_lblThreshold'))
@@ -129,7 +134,6 @@
for i in range(len(self.measure.event_tab)):
self.add_row(i)
-
###########################################################
#
# Update the labels
@@ -137,6 +141,7 @@
###########################################################
def update_labels(self):
self.get_widget("lbl_conf_event").set_text(_me.string('conf_lblEvent'))
+
self.get_widget("lbl_conf_type").set_text(_me.string('conf_lblType'))
self.get_widget("lbl_conf_value").set_text(_me.string('conf_lblValue'))
self.get_widget("lbl_conf_time").set_text(_me.string('conf_lblTime'))
@@ -149,6 +154,7 @@
self.get_widget("lbl_conf_sample").set_text(_me.string('conf_lblSample'))
self.get_widget("lbl_conf_rate").set_text(_me.string('conf_lblRate'))
self.get_widget("lblControlFrame").set_text(_me.string('conf_lblControl'))
+ self.get_widget("lblScript").set_text(_me.string('MainBehavior'))
###########################################################
@@ -156,15 +162,16 @@
# On row selected
#
###########################################################
- def on_row_selected(self, treeview, path, view_column):
- self.iter = self.value_list.get_iter(path)
- index = self.value_list.get_value(self.iter, 0)
- event = self.value_list.get_value(self.iter, 1)
- typet = self.value_list.get_value(self.iter, 2)
- value = self.value_list.get_value(self.iter, 3)
- time = self.value_list.get_value(self.iter, 4)
- notify = self.value_list.get_value(self.iter, 5)
- behavior = self.value_list.get_value(self.iter, 6)
+ def on_row_selected(self, obj):
+ path = obj.get_selected_rows()
+ self.__iter = self.value_list.get_iter(path[1][0])
+ index = self.value_list.get_value(self.__iter, 0)
+ event = self.value_list.get_value(self.__iter, 1)
+ typet = self.value_list.get_value(self.__iter, 2)
+ value = self.value_list.get_value(self.__iter, 3)
+ time = self.value_list.get_value(self.__iter, 4)
+ notify = self.value_list.get_value(self.__iter, 5)
+ behavior = self.value_list.get_value(self.__iter, 6)
if event == _me.string('conf_lblChange'):
self.get_widget('cbb_conf_event').set_active(0)
@@ -200,15 +207,15 @@
self.get_widget('conf_behavior').set_filename(behavior)
else:
self.get_widget('conf_behavior').set_filename('None')
+
-
###########################################################
#
# On row modified
#
###########################################################
def on_btn_conf_modify_clicked(self, widget, *args):
- index = self.value_list.get_value(self.iter, 0)
+ index = self.value_list.get_value(self.__iter, 0)
self.measure.event_tab = _me.get_param('config')
length = len(_me.get_param('config'))
@@ -225,11 +232,13 @@
False,
0]
self.measure.event_tab = _me.get_param('config')
- self.measure.event_tab[(index-1)] = value
- _me.set_param('config', self.measure.event_tab)
- self.value_list.clear()
- for i in range(len(self.measure.event_tab)):
- self.add_row(i)
+
+ if self.verify_tab(value):
+ self.measure.event_tab[(index-1)] = value
+ _me.set_param('config', self.measure.event_tab)
+ self.value_list.clear()
+ for i in range(len(self.measure.event_tab)):
+ self.add_row(i)
###########################################################
#
@@ -237,11 +246,11 @@
#
###########################################################
def on_btn_conf_remove_clicked(self, widget, *args):
- index = self.value_list.get_value(self.iter, 0)
+ index = self.value_list.get_value(self.__iter, 0)
self.measure.event_tab =_me.get_param('config')
self.measure.event_tab.pop(index - 1)
_me.set_param('config', self.measure.event_tab)
- self.iter = 0
+ self.__iter = 0
self.value_list.clear()
for i in range(len(self.measure.event_tab)):
self.add_row(i)
@@ -265,14 +274,27 @@
False,
0]
self.measure.event_tab = _me.get_param('config')
- self.measure.event_tab.append(value)
- self.refresh_tree()
+ if self.verify_tab(value):
+ self.measure.event_tab.append(value)
+ self.refresh_tree()
def refresh_tree(self):
_me.set_param('config', self.measure.event_tab)
self.value_list.clear()
for i in range(len(self.measure.event_tab)):
self.add_row(i)
+
+
+ def verify_tab(self, tab):
+ for i in range(len(self.measure.event_tab)):
+ if self.measure.event_tab[i][1] == tab[1]:
+ if self.measure.event_tab[i][2] == tab[2]:
+ if self.measure.event_tab[i][3] == tab[3]:
+ if self.measure.event_tab[i][4] == tab[4]:
+ if self.measure.event_tab[i][5] == tab[5]:
+ if self.measure.event_tab[i][6] == tab[6]:
+ return False
+ return True
###########################################################
#
@@ -349,8 +371,9 @@
def on_accept_clicked(self, widget, *args):
_me.set_param('Rate', float(self.get_widget('txt_conf_rate').get_text()))
_me.set_param('Sample',float(self.get_widget('txt_conf_sample').get_text()))
- self.measure.rate = _me.get_param('Rate')
- self.measure.sample = _me.get_param('Sample')
+ _me.set_param(('MainScript'), str(self.get_widget('mainScript').get_filename()))
+ self.measure.rate_backup = _me.get_param('Rate')
+ self.measure.sample_backup = _me.get_param('Sample')
_me.set_var('notify_delay', int(self.get_widget("delay_spinbutton").get_value()))
@@ -372,7 +395,7 @@
###########################################################
def on_btnBehavior_clicked(self, widget, *args):
self.get_widget('conf_behavior').set_filename('None')
- index = self.value_list.get_value(self.iter, 0)
+ index = self.value_list.get_value(self.__iter, 0)
self.measure.event_tab[index-1][6] = None
self.value_list.clear()
@@ -388,10 +411,10 @@
try:
float(self.get_widget('txt_conf_time').get_text())
except:
- self.get_widget('txt_conf_time').set_text('1.0')
+ self.get_widget('txt_conf_time').set_text('0.1')
- if float(self.get_widget('txt_conf_time').get_text()) < 1.0:
- self.get_widget('txt_conf_time').set_text('1.0')
+ if float(self.get_widget('txt_conf_time').get_text()) < self.measure.rate:
+ self.get_widget('txt_conf_time').set_text(str(self.measure.rate))
if float(self.get_widget('txt_conf_time').get_text()) > self.measure.rate * self.measure.sample:
self.get_widget('txt_conf_time').set_text(str(self.measure.rate * self.measure.sample))
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/widget/other.glade
===================================================================
(Binary files differ)
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/widget/other.pyp 2007-10-10 13:52:16 UTC (rev 599)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/widget/other.pyp 2007-10-10 15:04:47 UTC (rev 600)
@@ -16,70 +16,36 @@
#
###########################################################
def new(self):
- #Fill the text box with the previous values
- self.get_widget("valDrop_percent").set_text(str(_me.get_param('drop')))
- self.get_widget("valRaise_percent").set_text(str(_me.get_param('raise')))
- self.get_widget("valChangeU_percent").set_text(str(_me.get_param('changeU')))
- self.get_widget("valChangeD_percent").set_text(str(_me.get_param('changeD')))
- self.get_widget("valDrop_time").set_text(str(_me.get_param('drop_time')))
- self.get_widget("valRaise_time").set_text(str(_me.get_param('raise_time')))
- self.get_widget("valChangeD_time").set_text(str(_me.get_param('changeD_time')))
- self.get_widget("valChangeU_time").set_text(str(_me.get_param('changeU_time')))
- self.get_widget("valThreshold").set_text(str(_me.get_param('threshold')))
- self.get_widget("txtRate").set_text(str(_me.get_param('Rate')))
- self.get_widget("txtSample").set_text(str(_me.get_param('Sample')))
-
- #Restore the previous radio button status
- self.get_widget('radDrop').set_active(_me.get_param('drop_rad'))
- self.get_widget('radRaise').set_active(_me.get_param('raise_rad'))
- self.get_widget('radChangeD').set_active(_me.get_param('changeD_rad'))
- self.get_widget('radChangeU').set_active(_me.get_param('changeU_rad'))
- self.get_widget('radIncrease').set_active(_me.get_param('increase_rad'))
- self.get_widget('radDecrease').set_active(_me.get_param('decrease_rad'))
- self.get_widget('radBoth').set_active(_me.get_param('both_rad'))
-
- #Restore the check boxes
- self.get_widget('chkThreshold').set_active(_me.get_param('threshold_chk'))
- self.get_widget('chk_ThresholdBehavior').set_active(_me.get_param('chk_ThresholdBehavior'))
- self.get_widget('chk_ChangeBehavior').set_active(_me.get_param('chk_ChangeBehavior'))
self.get_widget("window1").set_title(_me.string('name_to_read'))
+ self.get_widget("lblThreshold").set_text(_me.string('widget_lblTest'))
- #Set the labels
- self.get_widget("radBoth").set_label(_me.string('widget_lblBoth'))
- self.get_widget("lblBtnApply").set_text(_me.string('widget_lblBtnApply'))
- self.get_widget("lblChange").set_text(_me.string('widget_lblChange'))
- self.get_widget("radChangeD").set_label(_me.string('widget_lblChangeD'))
- self.get_widget("radChangeU").set_label(_me.string('widget_lblChangeU'))
- self.get_widget("radDecrease").set_label(_me.string('widget_lblDecrease'))
- self.get_widget("radDrop").set_label(_me.string('widget_lblDrop'))
- self.get_widget("lblEventChange").set_text(_me.string('widget_lblEvent'))
- self.get_widget("lblEventThreshold").set_text(_me.string('widget_lblEvent'))
- self.get_widget("radIncrease").set_label(_me.string('widget_lblIncrease'))
- self.get_widget("radRaise").set_label(_me.string('widget_lblRaise'))
- self.get_widget("lblThreshold").set_text(_me.string('widget_lblThreshold'))
- self.get_widget("lblValue").set_text(_me.string('widget_lblValue'))
- self.get_widget("lblControl").set_text(_me.string('widget_lblControl'))
- self.get_widget("chkThreshold").set_label(_me.string('widget_lblDisplayThreshold'))
- self.get_widget('chk_ThresholdBehavior').set_label(_me.string('widget_lblBehavior'))
- self.get_widget('chk_ChangeBehavior').set_label(_me.string('widget_lblBehavior'))
- self.get_widget('chkChangeNotified').set_label(_me.string('widget_lblNotified'))
- self.get_widget('chkThresholdNotified').set_label(_me.string('widget_lblNotified'))
- self.get_widget("lblRate").set_text(_me.string('gui_conf_rate_lb'))
- self.get_widget("lblSample").set_text(_me.string('gui_conf_sample_lb'))
self.get_widget("lblBtnDark").set_label(_me.string('widget_lblDark'))
self.get_widget("lblBtnLight").set_label(_me.string('widget_lblLight'))
- self.get_widget("btnSet").set_label(_me.string('widget_lblSet'))
+ self.get_widget("btnAdd").set_label(_me.string('widget_lblSet'))
- for i in range (7):
- self.get_widget('cbbConfig').remove_text(0)
- self.get_widget('cbbConfig').append_text(_me.string('conf_lblDrop'))
- self.get_widget('cbbConfig').append_text(_me.string('conf_lblRaise'))
- self.get_widget('cbbConfig').append_text(_me.string('conf_lblChangeD'))
- self.get_widget('cbbConfig').append_text(_me.string('conf_lblChangeU'))
- self.get_widget('cbbConfig').append_text(_me.string('conf_lblIncrease'))
- self.get_widget('cbbConfig').append_text(_me.string('conf_lblDecrease'))
- self.get_widget('cbbConfig').append_text(_me.string('conf_lblBoth'))
- self.get_widget('cbbConfig').set_active(0)
+ self.get_widget('txtValue').set_text('1.0')
+ self.get_widget('txtTime').set_text('0.1')
+
+ self.get_widget('cbbEvent').append_text(_me.string('conf_lblChange'))
+ self.get_widget('cbbEvent').append_text(_me.string('conf_lblThreshold'))
+ self.get_widget('cbbEvent').set_active(0)
+
+ self.get_widget("lblEvent").set_text(_me.string('conf_lblEvent'))
+ self.get_widget("lblType").set_text(_me.string('conf_lblType'))
+ self.get_widget("lblValue").set_text(_me.string('conf_lblValue'))
+ self.get_widget("lblTime").set_text(_me.string('conf_lblTime'))
+ self.get_widget("lblNotify").set_text(_me.string('conf_lblNotified'))
+ self.get_widget("lblScript").set_text(_me.string('conf_lblBehavior'))
+ self.get_widget("lblBtnApply").set_text(_me.string('widget_lblBtnApply'))
+
+ tab = _me.get_param('test_tab')
+ self.get_widget('cbbEvent').set_active(tab[0][1])
+ self.get_widget('cbbType').set_active(tab[0][2])
+ self.get_widget('txtValue').set_text(str(tab[0][3]))
+ self.get_widget('txtTime').set_text(str(tab[0][4]))
+ self.get_widget('chkNotify').set_active(tab[0][5])
+ self.get_widget('Behavior').set_filename(tab[0][6])
+
thread.start_new_thread(self.update, ())
###########################################################
@@ -88,66 +54,10 @@
#
###########################################################
def update_value(self):
- #Rate
- _me.set_param('Rate', self.measure.rate)
- self.get_widget("txtRate").set_text(str(_me.get_param('Rate')))
-
- #Sample
- _me.set_param('Sample', self.measure.sample)
- self.get_widget("txtSample").set_text(str(_me.get_param('Sample')))
-
- #Drop
- _me.set_param('drop', self.measure.val_drop)
- self.get_widget("valDrop_percent").set_text(str(_me.get_param('drop')))
- _me.set_param('drop_time', self.measure.val_drop_time)
- self.get_widget("valDrop_time").set_text(str(_me.get_param('drop_time')))
-
- #Raise
- _me.set_param('raise', self.measure.val_raise)
- self.get_widget("valRaise_percent").set_text(str(_me.get_param('raise')))
- _me.set_param('raise_time', self.measure.val_raise_time)
- self.get_widget("valRaise_time").set_text(str(_me.get_param('raise_time')))
-
- #Drop and raise
- _me.set_param('changeD', self.measure.val_changeD)
- self.get_widget("valChangeD_percent").set_text(str(_me.get_param('changeD')))
- _me.set_param('changeD_time', self.measure.val_changeD_time)
- self.get_widget("valChangeD_time").set_text(str(_me.get_param('changeD_time')))
-
- #Raise and drop
- _me.set_param('changeU', self.measure.val_changeU)
- self.get_widget("valChangeU_percent").set_text(str(_me.get_param('changeU')))
- _me.set_param('changeU_time', self.measure.val_changeU_time)
- self.get_widget("valChangeU_time").set_text(str(_me.get_param('changeU_time')))
-
- #Threshold
- _me.set_param('threshold', self.measure.val_threshold)
- self.get_widget("valThreshold").set_text(str(_me.get_param('threshold')))
-
- self.measure.change_control()
-
- #update the radio button status
- self.measure.drop = _me.get_param('drop_rad')
- self.measure.raising = _me.get_param('raise_rad')
- self.measure.changeD = _me.get_param('changeD_rad')
- self.measure.changeU = _me.get_param('changeU_rad')
- self.measure.increase = _me.get_param('increase_rad')
- self.measure.decrease = _me.get_param('decrease_rad')
- self.measure.both = _me.get_param('both_rad')
self.measure.changetext = _me.string('conf_lblChange')
self.measure.thresholdtext = _me.string('conf_lblThreshold')
- # '' the check boxes
- self.measure.change_notified = _me.get_param('change_notified')
- self.measure.threshold_notified = _me.get_param('threshold_notified')
- self.measure.threshold_chk = _me.get_param('threshold_chk')
- self.measure.threshold_behavior_chk = _me.get_param('chk_ThresholdBehavior')
- self.measure.change_behavior_chk = _me.get_param('chk_ChangeBehavior')
-
-
-
-
###########################################################
#
# Event functions
@@ -156,133 +66,72 @@
def on_window1_destroy(self, widget, *args):
_me.get_param('measure').GUI_on = False
self.measure.GUI_on = False
-
+ def on_btnAdd_clicked(self, widget, *args):
+ length = len(_me.get_param('config'))
+ self.verify_value()
+ value = []
+ value = [(length + 1),
+ self.get_widget('cbbEvent').get_active(),
+ self.get_widget('cbbType').get_active(),
+ float(self.get_widget('txtValue').get_text()),
+ float(self.get_widget('txtTime').get_text()),
+ self.get_widget('chkNotify').get_active(),
+ str(self.get_widget('Behavior').get_filename()),
+ False,
+ 0]
+ self.measure.event_tab = _me.get_param('config')
+ verify_tab = _me.get_funct('verify_tab')
+ if verify_tab(value):
+ self.measure.event_tab.append(value)
+ refresh_tree = _me.get_funct('refresh_tree')
+ refresh_tree()
+
+ def on_btnApply_clicked(self, widget, *args):
+ length = len(_me.get_param('config'))
+ self.verify_value()
+ value = []
+ value = [(length + 1),
+ self.get_widget('cbbEvent').get_active(),
+ self.get_widget('cbbType').get_active(),
+ float(self.get_widget('txtValue').get_text()),
+ float(self.get_widget('txtTime').get_text()),
+ self.get_widget('chkNotify').get_active(),
+ str(self.get_widget('Behavior').get_filename()),
+ False,
+ 0]
+ self.measure.test_tab[0] = value
+ _me.set_param('test_tab', value)
- def on_btnSet_clicked(self, widget, *args):
-
- if self.measure.threshold_behavior_chk:
- threshold_script = self.measure.threshold_behavior
- else:
- threshold_script = None
+
- if self.measure.change_behavior_chk:
- change_script = self.measure.change_behavior
+ def on_expander_activate(self, widget, *args):
+ self.get_widget('txtValue').set_text(str(self.measure.test_tab[0][3]))
+ self.get_widget('txtTime').set_text(str(self.measure.test_tab[0][4]))
+
+ ###########################################################
+ #
+ # On combo box event
+ #
+ ###########################################################
+ def on_cbb_conf_event_changed(self, widget, *args):
+ if self.get_widget('cbbEvent').get_active() == 0:
+ for i in range (4):
+ self.get_widget('cbbType').remove_text(0)
+ self.get_widget('cbbType').append_text(_me.string('conf_lblDrop'))
+ self.get_widget('cbbType').append_text(_me.string('conf_lblRaise'))
+ self.get_widget('cbbType').append_text(_me.string('conf_lblChangeD'))
+ self.get_widget('cbbType').append_text(_me.string('conf_lblChangeU'))
+ self.get_widget('cbbType').set_active(0)
else:
- change_script = None
+ for i in range (4):
+ self.get_widget('cbbType').remove_text(0)
+ self.get_widget('cbbType').append_text(_me.string('conf_lblIncrease'))
+ self.get_widget('cbbType').append_text(_me.string('conf_lblDecrease'))
+ self.get_widget('cbbType').append_text(_me.string('conf_lblBoth'))
+ self.get_widget('cbbType').set_active(0)
- if self.get_widget('cbbConfig').get_active() == 0:
- val = [len(self.measure.event_tab)+1, 0, 0,
- self.measure.val_drop,
- self.measure.val_drop_time,
- self.measure.change_notified,
- change_script,
- False,
- 0]
- elif self.get_widget('cbbConfig').get_active() == 1:
- val = [len(self.measure.event_tab)+1, 0, 1,
- self.measure.val_raise,
- self.measure.val_raise_time,
- self.measure.change_notified,
- change_script,
- False,
- 0]
- elif self.get_widget('cbbConfig').get_active() == 2:
- val = [len(self.measure.event_tab)+1, 0, 2,
- self.measure.val_changeD,
- self.measure.val_changeD_time,
- self.measure.change_notified,
- change_script,
- False,
- 0]
- elif self.get_widget('cbbConfig').get_active() == 3:
- val = [len(self.measure.event_tab)+1, 0, 3,
- self.measure.val_changeU,
- self.measure.val_changeU_time,
- self.measure.change_notified,
- change_script,
- False,
- 0]
- elif self.get_widget('cbbConfig').get_active() == 4:
- val = [len(self.measure.event_tab)+1, 1, 0,
- self.measure.val_threshold,
- 0,
- self.measure.threshold_notified,
- threshold_script,
- False,
- 0]
- elif self.get_widget('cbbConfig').get_active() == 5:
- val = [len(self.measure.event_tab)+1, 1, 1,
- self.measure.val_threshold,
- 0,
- self.measure.threshold_notified,
- threshold_script,
- False,
- 0]
- elif self.get_widget('cbbConfig').get_active() == 6:
- val = [len(self.measure.event_tab)+1, 1, 2,
- self.measure.val_threshold,
- 0,
- self.measure.threshold_notified,
- threshold_script,
- False,
- 0]
- self.measure.event_tab.append(val)
- refresh_tree = _me.get_funct('refresh_tree')
-
- refresh_tree()
-
- def on_btnApply_clicked(self, widget, *args):
- #Store the new radio buttons status
- _me.set_param('drop_rad', self.get_widget('radDrop').get_active())
- _me.set_param('raise_rad', self.get_widget('radRaise').get_active())
- _me.set_param('changeD_rad', self.get_widget('radChangeD').get_active())
- _me.set_param('changeU_rad', self.get_widget('radChangeU').get_active())
- _me.set_param('increase_rad', self.get_widget('radIncrease').get_active())
- _me.set_param('decrease_rad', self.get_widget('radDecrease').get_active())
- _me.set_param('both_rad', self.get_widget('radBoth').get_active())
- _me.set_param('threshold_chk', self.get_widget('chkThreshold').get_active())
- _me.set_param('chk_ThresholdBehavior', self.get_widget('chk_ThresholdBehavior').get_active())
- _me.set_param('threshold_notified', self.get_widget('chkThresholdNotified').get_active())
- _me.set_param('change_notified', self.get_widget('chkChangeNotified').get_active())
- _me.set_param('chk_ChangeBehavior', self.get_widget('chk_ChangeBehavior').get_active())
- temp_rate = self.check_float_value(self.get_widget('txtRate').get_text(), 1, 3600)
- temp_sample = self.check_float_value(self.get_widget('txtSample').get_text(), 1, 100000)
- #sample and rate param
- if temp_rate != self.measure.rate or temp_sample != self.measure.sample:
- self.measure.rate = temp_rate
- self.measure.sample = temp_sample
- self.measure.val_table = [0] * (int(self.measure.sample)+1)
-
-
- max_time = self.measure.rate * self.measure.sample
-
- self.measure.val_drop = self.check_float_value(self.get_widget('valDrop_percent').get_text(), 1, 100)
- self.measure.val_drop_time = self.check_float_value(self.get_widget('valDrop_time').get_text(), self.measure.rate, max_time)
- self.measure.val_raise = self.check_float_value(self.get_widget('valRaise_percent').get_text(), 1, 100)
- self.measure.val_raise_time = self.check_float_value(self.get_widget('valRaise_time').get_text(), self.measure.rate, max_time)
- self.measure.val_changeD = self.check_float_value(self.get_widget('valChangeD_percent').get_text(), 1, 100)
- self.measure.val_changeD_time = self.check_float_value(self.get_widget('valChangeD_time').get_text(), self.measure.rate, max_time)
- self.measure.val_changeU = self.check_float_value(self.get_widget('valChangeU_percent').get_text(), 1, 100)
- self.measure.val_changeU_time = self.check_float_value(self.get_widget('valChangeU_time').get_text(), self.measure.rate, max_time)
- self.measure.val_threshold = self.check_float_value(self.get_widget('valThreshold').get_text(), 0, 100)
-
- #Update values
- self.update_value()
-
- def on_threshold_selection_changed(self, widget, *args):
- filename = widget.get_filename()
- filename = filename.replace('%20', ' ')
- _me.set_param('behavior_file_threshold', filename)
- _me.get_param('measure').threshold_behavior = _me.get_param('behavior_file_threshold')
-
- def on_change_selection_changed(self, widget, *args):
- filename = widget.get_filename()
- filename = filename.replace('%20', ' ')
- _me.set_param('behavior_file_change', filename)
- _me.get_param('measure').change_behavior = _me.get_param('behavior_file_change')
-
###########################################################
#
# Value integrity control
@@ -300,19 +149,44 @@
value = float(maximum)
return value
+
+
def update(self):
self.graph = Graph()
_me.set_param('graph', self.graph)
- _me.update_informations()
+ #_me.update_informations()
self.measure = _me.get_param('measure')
_me.get_param('measure').graph_measure = self.graph
_me.get_param('graph').measure_graph = self.measure
_me.get_param('measure').GUI_on = True
self.update_value()
- self.graph.set_size_request(600, 300)
+ self.graph.set_size_request(400, 200)
gtk.gdk.threads_enter()
layout = self.get_widget('vbox2')
layout.add(self.graph)
layout.show_all()
gtk.gdk.threads_leave()
+
+ def verify_value(self):
+ try:
+ float(self.get_widget('txtTime').get_text())
+ except:
+ self.get_widget('txtTime').set_text('1.0')
+
+ if float(self.get_widget('txtTime').get_text()) < 1.0:
+ self.get_widget('txtTime').set_text('1.0')
+ if float(self.get_widget('txtTime').get_text()) > self.measure.rate * self.measure.sample:
+ self.get_widget('txtTime').set_text(str(self.measure.rate * self.measure.sample))
+
+ try:
+ float(self.get_widget('txtValue').get_text())
+ except:
+ self.get_widget('txtValue').set_text('1')
+
+ if float(self.get_widget('txtValue').get_text()) < 1:
+ self.get_widget('txtValue').set_text('1')
+ if float(self.get_widget('txtValue').get_text()) > 100:
+ self.get_widget('txtValue').set_text('100')
+
+
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp 2007-10-10 13:52:16 UTC (rev 599)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp 2007-10-10 15:04:47 UTC (rev 600)
@@ -1,9 +1,5 @@
sys.path.append(_me.get_path('root') + '/Scripts/Python')
-try:
- from Battery_class import Measure
-except:
- print sys.exc_info()
-
+from Battery_class import Measure
measure = Measure()
_me.set_param('measure', measure)
@@ -18,6 +14,8 @@
measure.val_changeD_time = float(_me.get_param('changeD_time'))
measure.val_changeU_time = float(_me.get_param('changeU_time'))
measure.val_threshold = float(_me.get_param('threshold'))
+measure.test_tab = _me.get_param('test_tab')
+
#update the radio button status
measure.drop = _me.get_param('drop_rad')
@@ -30,10 +28,11 @@
# '' the check boxes
measure.threshold_chk = _me.get_param('threshold_chk')
-measure.change_control()
+#measure.change_control()
# update the sample and rate values
if _me.get_param('Rate') != (0 or None or '') and float(_me.get_param('Rate')) != measure.rate:
+ measure.tick = 1
measure.rate = float(_me.get_param('Rate'))
if _me.get_param('Sample') != (0 or None or '' or '1') and float(_me.get_param('Sample')) != measure.sample:
measure.val_table = [0] * int(_me.get_param('Sample'))
@@ -46,8 +45,8 @@
monitor_id = tux.monitoring.insert(0x25, measure.on_battery_level)
_me.set_param('monitor_id', monitor_id)
+
def destroy():
- print ' Remove'
tux.monitoring.remove(_me.get_param('monitor_id'))
_me.insert_funct('destroy', destroy)
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp 2007-10-10 13:52:16 UTC (rev 599)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp 2007-10-10 15:04:47 UTC (rev 600)
@@ -1,2 +1,3 @@
def update_informations():
pass
+
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml 2007-10-10 13:52:16 UTC (rev 599)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml 2007-10-10 15:04:47 UTC (rev 600)
@@ -4,6 +4,7 @@
<conf_lblThreshold type='str'>Seuil</conf_lblThreshold>
<gui_conf_remote_title type='str'>Contrôle</gui_conf_remote_title>
<conf_lblRaise type='str'>Accroissement</conf_lblRaise>
+ <widget_lblTest type='str'>Notifications</widget_lblTest>
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<conf_lblEvent type='str'>Evènement</conf_lblEvent>
<widget_lblControl type='str'>Contrôle</widget_lblControl>
@@ -20,6 +21,7 @@
<conf_lblChangeU type='str'>Augmente et chute</conf_lblChangeU>
<gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt>
<gui_conf_rate_lb type='str'>Taux de rafraichissement :</gui_conf_rate_lb>
+ <mainscript type='str'>J'ai trouvé la lumière !</mainscript>
<conf_btnRemove t...
[truncated message content] |
