Changeset 2610

Timestamp:

01/24/07 14:34:23 (6 years ago)

Author:

DrewCormier

Message:

replaced getSimpleSequence function so that it can read xml with values tags

Files:

• WaveDev/branches/WaveDev_Max_0.7/WaveDev/wavedev/importResource.py (modified) (3 diffs)

WaveDev/branches/WaveDev_Max_0.7/WaveDev/wavedev/importResource.py

@@ -218 +218 @@
     return newProp
     
-def getSimpleSequenceProperty(s):   
+def getSimpleSequenceProperty(s):
     if not hasattr(s,"name"):
         return None
@@ -241 +241 @@
         return None
     
-    newProp = CC.SimpleSequenceProperty(tmpName,tmpMode,tmpType,description=tmpDes,values=[])
-    
-    if hasattr(s,"value"):
-        for val in s.value:
-            newProp.values.append((str(val), str(val)))
-    
+    newProp = CC.SimpleSequenceProperty(tmpName,tmpMode,tmpType,description=tmpDes)
+    
+    if hasattr(s,"id"):     #UUID in the sad file will need to match the UUID in the prf (tmpID is from prf)
+        newProp.id = tmpId
+    
+    newProp.values = []
+    newProp.defaultValues = []
+    
+    if hasattr(s,"values"): 
+        for tmpVal in s.values.value: 
+            newProp.values.append(str(tmpVal))
+            newProp.defaultValues.append(str(tmpVal))
+            
     if hasattr(s,"units"):
         newProp.units = str(s.units)
@@ -252 +259 @@
     if hasattr(s,"range"):
         newProp.range = (str(s.range.min),str(s.range.max))
+        
+    if hasattr(s,"enum"):
+        newProp.enum = str(s.enum.label)
         
     if not hasattr(s, "kind"):