Added support for default values

api/gui/mainframe.py

@@ -26,6 +26,8 @@ class MFWgt(QtGui.QWidget):
         self.radio_dict = {}
         self.ButGrp_dict = {}
         
+        self.default_list = {}
+        
         
         self.param_object = create_obj(self.ClientObj.client, self.method_name)
         
@@ -113,6 +115,9 @@ class MFWgt(QtGui.QWidget):
 
                 elif field.element == 'radio':
                     choice = field.choice[0]
+                    if field.default:
+                        self.default_list[field.name] = field.default
+                    else: self.default_list[field.name] = None
                     
                     self.GroupBox = QGroupBox(field.label)
                     self.ButGrp_dict[field.name] = QtGui.QButtonGroup()
@@ -136,6 +141,7 @@ class MFWgt(QtGui.QWidget):
 #                        radiolist[i].clicked.connect(temp(self))
                     
 #                    self.ButGrp_dict[field.name].buttonClicked.connect(temp(self))
+
                     self.radio_dict[field.name] = self.ButGrp_dict[field.name]
 #                    QtGui.QButtonGroup.buttonClicked.connect(temp(self))
 #                    radiolist[0].setChecked(True)
@@ -149,12 +155,23 @@ class MFWgt(QtGui.QWidget):
 
 
                 elif field.element == 'combo':
-                    choice = field.choice[0]
+                    self.ButGrp_dict[field.name] = False
+                    choice = field.choice[0]                    
+                    if field.default:
+                        self.default_list[field.name] = field.default
+                    else: self.default_list[field.name] = None
                     
                     self.grid.addWidget(QLabel(field.name), x, y)
                     self.ComboBox = QComboBox(self)
                     for i in range(0,len(choice)):
                         self.ComboBox.addItem(choice[i])
+                    
+                    def temp(self, name):
+                        def wrapper():
+                            self.ButGrp_dict[name] = True
+                        return wrapper
+                    self.ComboBox.currentIndexChanged.connect(temp(self, field.name))
+                    
                     self.view_dict[field.name] = self.ComboBox
                     self.grid.addWidget(self.view_dict[field.name], x, y+1)
                     x += 1
@@ -181,14 +198,14 @@ class MFWgt(QtGui.QWidget):
             
 
             if type (self.view_dict[field_name]) == QGroupBox:
-                self.param_object[field_name] = self.ButGrp_dict[field_name].checkedButton().text()
-                
-                
-#                self.param_object[field_name] = self.view_dict[field_name]
+                if self.ButGrp_dict[field_name].checkedButton():
+                    self.param_object[field_name] = \
+                            self.ButGrp_dict[field_name].checkedButton().text()
+                elif self.default_list[field_name]:
+                    self.param_object[field_name] = self.default_list[field_name]
+                else:
+                    self.param_object[field_name] = ''
                 print self.param_object[field_name]
-#                w = self.view_dict[field_name]
-#                import ipdb
-#                ipdb.set_trace()
                 
             if type (self.view_dict[field_name]) == QCheckBox:
                 self.param_object[field_name] = \
@@ -196,18 +213,18 @@ class MFWgt(QtGui.QWidget):
                 print self.param_object[field_name]
 
             if type (self.view_dict[field_name]) == QComboBox:
-#                bo = self.view_dict[field_name]
-#                import ipdb
-#                ipdb.set_trace()
-                self.param_object[field_name] = \
-                            self.view_dict[field_name].currentText()
+                if self.ButGrp_dict[field_name]:
+                    self.param_object[field_name] = \
+                                self.view_dict[field_name].currentText()
+                elif self.default_list[field_name]:
+                    self.param_object[field_name] = self.default_list[field_name]
+                else:
+                    self.param_object[field_name] = ''                    
                 print self.param_object[field_name]
 
             if type (self.view_dict[field_name]) == QLineEdit:
                 self.param_object[field_name] = \
                             str(self.view_dict[field_name].text())
-#                print type(self.param_object[field_name])
-#                print type (str)
                 
             
 #        self.param_object[field.name]