[tuxdroid-svn] r4571 - in softwares_suite_v3/kysoh/tuxware/server/trunk: resources/01_robot_system util/applicationserver/gadget

[remi <c2m...@c2...>]

Author: remi
Date: 2009-04-21 12:27:28 +0200 (Tue, 21 Apr 2009)
New Revision: 4571

Modified:
   softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
   softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
   softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py
Log:
* updated methods to update the gadgets parameters of the configured gadgets

Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
===================================================================
--- softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py	2009-04-21 09:51:21 UTC (rev 4570)
+++ softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py	2009-04-21 10:27:28 UTC (rev 4571)
@@ -353,17 +353,19 @@
         else:
             return False
 
-    def updateConfigurationParameters(self, gadgetUuid, parameters):
+    def updateConfigurationParameters(self, gadgetUuid, parameters,
+        hiddenParameters):
         """Update the parameters of a configured gadget.
         @param gadgetUuid: Gadget uuid.
         @param parameters: Parameters.
+        @param hiddenParameters: Hidden parameters list.
         @return: The success.
         """
         gadget = self.__gadgetsContainer.getGadgetByUuid(gadgetUuid)
         if gadget != None:
             if not gadget.isConfiguration():
                 return False
-            gadget.updateParameters(parameters)
+            gadget.updateParameters(parameters, hiddenParameters)
             self.__gadgetsContainer.storeConfiguration(gadget)
             self.__publishEvents(True, ST_NAME_FW_CONFIGURATIONS_LOADED,
                 ["True",])
@@ -896,6 +898,7 @@
         self.parametersDict = {
             'uuid' : 'string',
             'parameters' : 'string',
+            'hiddenParameters' : 'string'
         }
         self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
         self.exclusiveExecution = False
@@ -913,8 +916,9 @@
             param = paramStruct.split("=")
             if len(param) == 2:
                 params[param[0]] = param[1]
+        hiddenParameters = parameters['hiddenParameters'].split("|")
         if not resourceGadgetFramework.updateConfigurationParameters(uuid,
-            params):
+            params, hiddenParameters):
             contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
         return headersStruct, contentStruct
 

Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
===================================================================
--- softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py	2009-04-21 09:51:21 UTC (rev 4570)
+++ softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py	2009-04-21 10:27:28 UTC (rev 4571)
@@ -12,7 +12,7 @@
 except:
     from md5 import md5
 
-from Gadget import Gadget
+from Gadget import *
 
 # ------------------------------------------------------------------------------
 # ConfiguredGadget class.
@@ -51,7 +51,7 @@
                 if key == parameter.getName():
                     parameter.setDefaultValue(configuration['parameters'][key])
             if parameter.getName() in configuration['hiddenParameters']:
-                parameter.setVisible(False)
+                parameter.setVisible("false")
         # Set the gadget description
         self.getDescription().setUuid(configuration['description']['uuid'])
         self.getDescription().setName(configuration['description']['name'])
@@ -80,15 +80,22 @@
     # --------------------------------------------------------------------------
     # Update the parameter.
     # --------------------------------------------------------------------------
-    def updateParameters(self, parameters):
+    def updateParameters(self, parameters, hiddenParameters = []):
         """Update the parameter.
         @param parameters: Gadget parameters.
+        @param hiddenParameters: Hidden parameters list.
         """
         self.__configuration['parameters'] = parameters
+        self.__configuration['hiddenParameters'] = hiddenParameters
         for parameter in self.getParameters():
             for key in parameters.keys():
                 if key == parameter.getName():
                     parameter.setDefaultValue(parameters[key])
+            if parameter.getName() not in INTERNAL_PARAMETERS_LIST:
+                if parameter.getName() in hiddenParameters:
+                    parameter.setVisible("false")
+                else:
+                    parameter.setVisible("true")
 
     # --------------------------------------------------------------------------
     # Update the name.

Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py
===================================================================
--- softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py	2009-04-21 09:51:21 UTC (rev 4570)
+++ softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py	2009-04-21 10:27:28 UTC (rev 4571)
@@ -21,6 +21,8 @@
 # Default list of the supported language.
 SUPPORTED_LANGUAGES_LIST = ["en", "fr", "nl", "es", "it", "pt", "ar", "da",
     "de", "no", "sv",]
+# Internal parameters list
+INTERNAL_PARAMETERS_LIST = ["traces", "language", "country", "locutor", "pitch"]
 
 # ------------------------------------------------------------------------------
 # Gadget class.