|
|
|
@ -76,14 +76,13 @@ class MainFrame(QtGui.QWidget):
|
|
|
|
|
icon_visible(ClientObj.MainWidget, 'Back', True)
|
|
|
|
|
|
|
|
|
|
self.initUI()
|
|
|
|
|
|
|
|
|
|
def isBrief(self, step = None):
|
|
|
|
|
steps = self.ClientObj.param_objects[self.method_name]['steps_field']
|
|
|
|
|
if hasattr (steps, 'label'):
|
|
|
|
|
if steps.label:
|
|
|
|
|
if step == None:
|
|
|
|
|
step = self.ClientObj.param_objects[self.method_name]['step']
|
|
|
|
|
if len(steps.tablevalue.head.string)-1 == step:
|
|
|
|
|
if len(steps.tablevalue.head.string) == step:
|
|
|
|
|
return True
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
@ -298,7 +297,6 @@ class MainFrame(QtGui.QWidget):
|
|
|
|
|
if self.ClientObj.param_objects[self.method_name]['error']:
|
|
|
|
|
self.highlight_errors()
|
|
|
|
|
self.error_output = True
|
|
|
|
|
|
|
|
|
|
# create steps
|
|
|
|
|
if (self.ClientObj.param_objects[self.method_name]['step'] > 0) and \
|
|
|
|
|
self.ClientObj.param_objects[self.method_name] ['steps_field']:
|
|
|
|
@ -306,7 +304,6 @@ class MainFrame(QtGui.QWidget):
|
|
|
|
|
[self.method_name] ['steps_field'])
|
|
|
|
|
self.ClientObj.MainWidget.left_frame.changed_step \
|
|
|
|
|
(self.ClientObj.param_objects[self.method_name]['step'])
|
|
|
|
|
|
|
|
|
|
self.update()
|
|
|
|
|
self.updateGeometry()
|
|
|
|
|
|
|
|
|
@ -1580,7 +1577,6 @@ class MainFrame(QtGui.QWidget):
|
|
|
|
|
|
|
|
|
|
def plus_row (self, table, field):
|
|
|
|
|
def wrapper():
|
|
|
|
|
# print 'plus_field'
|
|
|
|
|
self.PlusWgt = PlusRow(self, table, field)
|
|
|
|
|
self.PlusWgt.setAttribute(QtCore.Qt.WA_ShowModal)
|
|
|
|
|
self.PlusWgt.show()
|
|
|
|
@ -1797,40 +1793,32 @@ class MainFrame(QtGui.QWidget):
|
|
|
|
|
|
|
|
|
|
def expert_remove(self, field_name):
|
|
|
|
|
def wrapper():
|
|
|
|
|
print 'field_name = ', field_name
|
|
|
|
|
if field_name in self.expert_list:
|
|
|
|
|
self.expert_list.remove(field_name)
|
|
|
|
|
print 'self.expert_list = ', self.expert_list
|
|
|
|
|
|
|
|
|
|
if not field_name in self.changed_expert_list:
|
|
|
|
|
self.changed_expert_list.append(field_name)
|
|
|
|
|
return wrapper
|
|
|
|
|
|
|
|
|
|
def remove_expert(self, field_name):
|
|
|
|
|
print 'field_name = ', field_name
|
|
|
|
|
if field_name in self.expert_list:
|
|
|
|
|
self.expert_list.remove(field_name)
|
|
|
|
|
print 'self.expert_list = ', self.expert_list
|
|
|
|
|
|
|
|
|
|
if not field_name in self.changed_expert_list:
|
|
|
|
|
self.changed_expert_list.append(field_name)
|
|
|
|
|
|
|
|
|
|
def expert_add(self, field_name):
|
|
|
|
|
def wrapper():
|
|
|
|
|
print 'field_name = ', field_name
|
|
|
|
|
if not field_name in self.expert_list:
|
|
|
|
|
self.expert_list.append(field_name)
|
|
|
|
|
print 'self.expert_list = ', self.expert_list
|
|
|
|
|
|
|
|
|
|
if field_name in self.changed_expert_list:
|
|
|
|
|
self.changed_expert_list.remove(field_name)
|
|
|
|
|
return wrapper
|
|
|
|
|
|
|
|
|
|
def add_expert(self, field_name):
|
|
|
|
|
print 'field_name = ', field_name
|
|
|
|
|
if not field_name in self.expert_list:
|
|
|
|
|
self.expert_list.append(field_name)
|
|
|
|
|
print 'self.expert_list = ', self.expert_list
|
|
|
|
|
|
|
|
|
|
if field_name in self.changed_expert_list:
|
|
|
|
|
self.changed_expert_list.remove(field_name)
|
|
|
|
@ -1960,7 +1948,6 @@ class MainFrame(QtGui.QWidget):
|
|
|
|
|
(self.ClientObj.client, self.expert_list)
|
|
|
|
|
for fields in self.expert_list:
|
|
|
|
|
self.param_object[fields] = None
|
|
|
|
|
# print 'self.param_object', self.param_object
|
|
|
|
|
return wrapper
|
|
|
|
|
|
|
|
|
|
def collect_table (self, field):
|
|
|
|
|