[tuxdroid-svn] r648 - in software/gadgets/light_monitor/trunk: . Light_monitor Light_monitor/Script
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r648 - in software/gadgets/light_monitor/trunk: . Light_monitor Light_monitor/Scripts/Python/GUI/conf Light_monitor/Strings
|
From: Paul_R <c2m...@c2...> - 2007-10-30 15:00:45
|
Author: Paul_R
Date: 2007-10-30 16:00:42 +0100 (Tue, 30 Oct 2007)
New Revision: 648
Modified:
software/gadgets/light_monitor/trunk/Light_monitor.tgf
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp
software/gadgets/light_monitor/trunk/Light_monitor/Strings/fr_ALL.xml
software/gadgets/light_monitor/trunk/Light_monitor/about.xml
software/gadgets/light_monitor/trunk/Light_monitor/settings.xml
software/gadgets/light_monitor/trunk/Light_monitor/strings.xml
Log:
* Change the help file
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade
===================================================================
(Binary files differ)
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-10-30 09:02:42 UTC (rev 647)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-10-30 15:00:42 UTC (rev 648)
@@ -243,6 +243,9 @@
for i in range(len(self.measure.event_tab)):
self.add_row(i)
+ path = _me.get_path('data')+'/Data'
+ self.get_widget('conf_behavior').set_filename(path)
+
###########################################################
#
# On row deleted
@@ -258,6 +261,9 @@
for i in range(len(self.measure.event_tab)):
self.add_row(i)
+ path = _me.get_path('data')+'/Data'
+ self.get_widget('conf_behavior').set_filename(path)
+
###########################################################
#
# On row added
@@ -286,6 +292,9 @@
self.value_list.clear()
for i in range(len(self.measure.event_tab)):
self.add_row(i)
+ if self.measure.GUI_on == False:
+ path = _me.get_path('data')+'/Data'
+ self.get_widget('conf_behavior').set_filename(path)
def verify_tab(self, tab):
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Strings/fr_ALL.xml 2007-10-30 09:02:42 UTC (rev 647)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Strings/fr_ALL.xml 2007-10-30 15:00:42 UTC (rev 648)
@@ -9,6 +9,7 @@
<conf_lblEvent type='str'>Evènement</conf_lblEvent>
<widget_lblControl type='str'>Contrôle</widget_lblControl>
<Increase type='str'>La lumière est passée en dessus du seuil</Increase>
+ <widget_lblBehavior type='str'>Activer le script</widget_lblBehavior>
<gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
<speaker_name type='str'>Bruno8k</speaker_name>
<help_text type='str'>-- Les évènements :
@@ -44,7 +45,9 @@
Lorsque cette fenêtre est affichée, les évènements enregistrés dans la fenêtre de configuration ne sont plus notifiés.
Cette fenêtre permet de tester diverses configurations et de les ajouter dans le tableau de configuration.
-Une zone de test comportant deux boutons permettent à Tux de rechercher la direction la plus lumineuse, ou la plus sombre.</help_text>
+Une zone de test comportant deux boutons permettent à Tux de rechercher la direction la plus lumineuse, ou la plus sombre.
+
+Deux scripts de bases se trpouvent dans /tmp/Light_monitor/Data</help_text>
<ChangeU type='str'>La lumière a augmenté puis chuté</ChangeU>
<conf_lblChange type='str'>Changement</conf_lblChange>
<conf_lblBoth type='str'>Deux directions</conf_lblBoth>
@@ -60,7 +63,6 @@
<mainscript type='str'>J'ai trouvé la lumière !</mainscript>
<conf_btnRemove type='str'>Enlever</conf_btnRemove>
<gui_conf_delay_lb type='str'>Délai (sec)</gui_conf_delay_lb>
- <conf_lblNotNotified type='str'>Non notifié</conf_lblNotNotified>
<conf_btnBehavior type='str'>Supprimer</conf_btnBehavior>
<gui_conf_about_title type='str'>A propos</gui_conf_about_title>
<conf_lblChangeD type='str'>Chute et augmente</conf_lblChangeD>
@@ -69,7 +71,6 @@
<conf_lblSample type='str'>Points</conf_lblSample>
<conf_lblType type='str'>Type</conf_lblType>
<Change type='str'>La lumière a changé</Change>
- <conf_lblRate type='str'>Taux de rafraichissement</conf_lblRate>
<Both type='str'>La lumière a passé le seuil</Both>
<conf_btnModify type='str'>Modifier</conf_btnModify>
<widget_lblDrop type='str'>Chute</widget_lblDrop>
@@ -97,12 +98,13 @@
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<search type='str'>Je cherche ...</search>
<widget_lblChange type='str'>Changement</widget_lblChange>
+ <light5 type='str'>Je ne peux pas trouver d'où vient la lumière...</light5>
<widget_lblLight type='str'>Trouver lumière</widget_lblLight>
<name_to_read type='str'>Moniteur de lumière</name_to_read>
<gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
<Drop type='str'>La lumière a chuté</Drop>
<conf_lblDrop type='str'>Chute</conf_lblDrop>
- <widget_lblBehavior type='str'>Activer le script</widget_lblBehavior>
+ <conf_lblNotNotified type='str'>Non notifié</conf_lblNotNotified>
<Raise type='str'>La lumière a augmenté</Raise>
<conf_lblNotified type='str'>Notifié ?</conf_lblNotified>
<widget_lblSet type='str'>Ajouter a la config.</widget_lblSet>
@@ -111,7 +113,7 @@
<Decrease type='str'>La lumière est passée en dessous du seuil</Decrease>
<conf_lblValue type='str'>Valeur (%)</conf_lblValue>
<light4 type='str'>Je pense que la lumière vient de cette direction</light4>
- <light5 type='str'>Je ne peux pas trouver d'où vient la lumière...</light5>
+ <conf_lblRate type='str'>Taux de rafraichissement</conf_lblRate>
<Threshold type='str'>La lumière a atteint le seuil</Threshold>
<widget_lblChangeD type='str'>Changement inf.</widget_lblChangeD>
<conf_lblTime type='str'>Temps (sec.)</conf_lblTime>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/about.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/about.xml 2007-10-30 09:02:42 UTC (rev 647)
+++ software/gadgets/light_monitor/trunk/Light_monitor/about.xml 2007-10-30 15:00:42 UTC (rev 648)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<about>
+ <gadget_author type='str'>Paul Rathgeb</gadget_author>
+ <gadget_version type='str'>0.0.1</gadget_version>
<gadget_name type='str'>light_monitor</gadget_name>
- <gadget_author type='str'>Paul Rathgeb</gadget_author>
<gadget_description type='str'>Light monitor for tux droid</gadget_description>
- <gadget_version type='str'>0.0.1</gadget_version>
</about>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/settings.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/settings.xml 2007-10-30 09:02:42 UTC (rev 647)
+++ software/gadgets/light_monitor/trunk/Light_monitor/settings.xml 2007-10-30 15:00:42 UTC (rev 648)
@@ -10,22 +10,22 @@
<changeD_rad type='bool'>False</changeD_rad>
<threshold type='float'>50.0</threshold>
<decrease_rad type='bool'>False</decrease_rad>
- <behavior_file_threshold type='NoneType'>None</behavior_file_threshold>
+ <Sample type='float'>500.0</Sample>
<raise type='float'>10.0</raise>
<changeU_rad type='bool'>False</changeU_rad>
<threshold_notified type='bool'>False</threshold_notified>
<config type='list'>[]</config>
<behavior_file_change type='NoneType'>None</behavior_file_change>
+ <drop_rad type='bool'>True</drop_rad>
<raise_rad type='bool'>False</raise_rad>
<changeD type='float'>10.0</changeD>
<drop_time type='float'>1.0</drop_time>
<changeU type='float'>10.0</changeU>
<raise_time type='float'>1.0</raise_time>
<drop type='float'>10.0</drop>
- <drop_rad type='bool'>True</drop_rad>
<MainScript type='str'>
</MainScript>
- <Sample type='float'>500.0</Sample>
+ <behavior_file_threshold type='NoneType'>None</behavior_file_threshold>
<threshold_chk type='bool'>False</threshold_chk>
<Rate type='float'>0.1</Rate>
<changeD_time type='float'>1.0</changeD_time>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/strings.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/strings.xml 2007-10-30 09:02:42 UTC (rev 647)
+++ software/gadgets/light_monitor/trunk/Light_monitor/strings.xml 2007-10-30 15:00:42 UTC (rev 648)
@@ -3,16 +3,14 @@
<conf_lblIncrease type='str'>Increase</conf_lblIncrease>
<conf_lblThreshold type='str'>Threshold</conf_lblThreshold>
<gui_conf_remote_title type='str'>Control</gui_conf_remote_title>
- <conf_lblTime type='str'>Time (sec.)</conf_lblTime>
<conf_lblRaise type='str'>Raise</conf_lblRaise>
- <widget_lblSet type='str'>Add to config</widget_lblSet>
+ <power_supply type='str'>You must disconnect the power supply</power_supply>
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<conf_lblEvent type='str'>Event</conf_lblEvent>
<widget_lblControl type='str'>Control</widget_lblControl>
<Increase type='str'>The light level exceeded the threshold</Increase>
- <widget_lblBehavior type='str'>Enable behavior script</widget_lblBehavior>
+ <conf_btnRemove type='str'>Remove</conf_btnRemove>
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
- <speaker_name type='str'>Ryan8k</speaker_name>
<help_text type='str'>-- The events:
Two main types of events can take place, each containing various options:
@@ -46,8 +44,10 @@
When this window is displayed, the events stored in the settings window are not notified.
This window makes it possible to try various configurations and to add them in the settings table.
-In the test part with two buttons you can make Tux search for the light source or darkest spot.</help_text>
- <conf_lblBehavior type='str'>Behavior script</conf_lblBehavior>
+In the test part with two buttons you can make Tux search for the light source or darkest spot.
+
+Two example scripts can be found in /tmp/Light_monitor/Data.</help_text>
+ <ChangeU type='str'>The light level raised and dropped</ChangeU>
<conf_lblChange type='str'>Change</conf_lblChange>
<conf_lblBoth type='str'>Both</conf_lblBoth>
<widget_lblBtnApply type='str'>Apply changes</widget_lblBtnApply>
@@ -57,21 +57,23 @@
<gui_conf_update_title type='str'>Update</gui_conf_update_title>
<widget_lblValue type='str'>Value (%)</widget_lblValue>
<gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
- <widget_lblBoth type='str'>Both direction</widget_lblBoth>
+ <MainBehavior type='str'>Main behavior</MainBehavior>
+ <gui_conf_rate_lb type='str'>Refresh rate :</gui_conf_rate_lb>
<mainscript type='str'>I've found the light !</mainscript>
+ <light2 type='str'>ow wait, even lighter here.</light2>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
+ <conf_lblNotNotified type='str'>Not notified</conf_lblNotNotified>
<conf_btnBehavior type='str'>Clear path</conf_btnBehavior>
<gui_conf_about_title type='str'>About</gui_conf_about_title>
<conf_lblChangeD type='str'>Drop and raise</conf_lblChangeD>
- <widget_lblChangeD type='str'>Drop and raise</widget_lblChangeD>
- <power_supply type='str'>You must disconnect the power supply</power_supply>
+ <conf_lblChangeU type='str'>Raise and drop</conf_lblChangeU>
+ <speaker_name type='str'>Ryan8k</speaker_name>
<conf_lblSample type='str'>Samples</conf_lblSample>
<conf_lblType type='str'>Type</conf_lblType>
<Change type='str'>The light level changed</Change>
- <conf_lblValue type='str'>Value (%)</conf_lblValue>
+ <widget_lblDark type='str'>Search darkness</widget_lblDark>
<Both type='str'>The light level reached the threshold</Both>
<conf_btnModify type='str'>Modify</conf_btnModify>
- <widget_lblTest type='str'>Notifications</widget_lblTest>
<widget_lblDrop type='str'>Drop</widget_lblDrop>
<widget_lblNotified type='str'>Notified</widget_lblNotified>
<dark1 type='str'>It's pretty dark here.</dark1>
@@ -86,36 +88,36 @@
<conf_lblNotifiedBehavior type='str'>Notified</conf_lblNotifiedBehavior>
<gui_conf_author_lb type='str'>Author</gui_conf_author_lb>
<widget_lblRaise type='str'>Raise</widget_lblRaise>
- <conf_lblNotified type='str'>Notified ?</conf_lblNotified>
<ChangeD type='str'>The light level dropped and raised</ChangeD>
- <gui_conf_rate_lb type='str'>Refresh rate :</gui_conf_rate_lb>
+ <widget_lblBoth type='str'>Both direction</widget_lblBoth>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
<conf_lblDefaultBehavior type='str'>Default behavior</conf_lblDefaultBehavior>
- <conf_lblChangeU type='str'>Raise and drop</conf_lblChangeU>
+ <widget_lblDisplayThreshold type='str'>Display threshold on graph</widget_lblDisplayThreshold>
+ <conf_lblBehavior type='str'>Behavior script</conf_lblBehavior>
<dark2 type='str'>And darker here.</dark2>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<search type='str'>I seek ...</search>
<widget_lblChange type='str'>Change</widget_lblChange>
+ <light5 type='str'>I can't find the direction of the light.</light5>
<widget_lblLight type='str'>Search light</widget_lblLight>
<name_to_read type='str'>Light monitor</name_to_read>
<gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
<Drop type='str'>The light level dropped</Drop>
<conf_lblDrop type='str'>Drop</conf_lblDrop>
- <conf_lblNotNotified type='str'>Not notified</conf_lblNotNotified>
+ <widget_lblBehavior type='str'>Enable behavior script</widget_lblBehavior>
<Raise type='str'>The light level raised</Raise>
- <widget_lblThreshold type='str'>Threshold</widget_lblThreshold>
- <widget_lblDark type='str'>Search darkness</widget_lblDark>
- <light2 type='str'>ow wait, even lighter here.</light2>
+ <conf_lblNotified type='str'>Notified ?</conf_lblNotified>
+ <widget_lblSet type='str'>Add to config</widget_lblSet>
<light3 type='str'>or here ...</light3>
<light1 type='str'>Seeing more light over here.</light1>
<Decrease type='str'>The light level passed below the threshold</Decrease>
- <widget_lblDisplayThreshold type='str'>Display threshold on graph</widget_lblDisplayThreshold>
+ <conf_lblValue type='str'>Value (%)</conf_lblValue>
<light4 type='str'>I think the light is coming from this direction.</light4>
<conf_lblRate type='str'>Refresh rate</conf_lblRate>
<Threshold type='str'>The light reached the threshold</Threshold>
- <MainBehavior type='str'>Main behavior</MainBehavior>
- <ChangeU type='str'>The light level raised and dropped</ChangeU>
+ <widget_lblChangeD type='str'>Drop and raise</widget_lblChangeD>
+ <conf_lblTime type='str'>Time (sec.)</conf_lblTime>
<conf_lblControl type='str'>Control</conf_lblControl>
- <conf_btnRemove type='str'>Remove</conf_btnRemove>
- <light5 type='str'>I can't find the direction of the light.</light5>
+ <widget_lblTest type='str'>Notifications</widget_lblTest>
+ <widget_lblThreshold type='str'>Threshold</widget_lblThreshold>
</strings>
Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf
===================================================================
(Binary files differ)
|
