diff --git a/console/gui/MainFrameResult.py b/console/gui/MainFrameResult.py index ece79c7..9b20eae 100755 --- a/console/gui/MainFrameResult.py +++ b/console/gui/MainFrameResult.py @@ -130,7 +130,8 @@ class MainFrameRes(QtGui.QWidget): if not table.body: table.body = [[]] - + self.show_normal(item) + if self.method_name in self.ClientObj.param_objects: if len(table.body[0]) >= self.ClientObj.count_row_res_table or \ self.ClientObj.param_objects[self.method_name]['offset']: @@ -167,7 +168,6 @@ class MainFrameRes(QtGui.QWidget): self.mytable.verticalHeader().hide() self.mytable.horizontalHeader().resizeSections \ (QtGui.QHeaderView.ResizeMode.ResizeToContents) - self.show_normal(item) self.work_layout._addWidget(self.mytable) self.ClientObj.app.processEvents() @@ -345,6 +345,11 @@ class MainFrameRes(QtGui.QWidget): self._parent.main_frame.setWidgetResizable(True) return 0 + if hasattr (self, "mytable"): + if type(self.mytable) == SelectedTableWidget: + self.initUI() + return 0 + clear_wgt = QtGui.QWidget(self) clear_layout = QtGui.QHBoxLayout(clear_wgt) diff --git a/console/gui/mainframe.py b/console/gui/mainframe.py index c373958..805b029 100755 --- a/console/gui/mainframe.py +++ b/console/gui/mainframe.py @@ -508,7 +508,7 @@ class MainFrame(QtGui.QWidget): self.view_dict[field.name].setDisabled(True) self.view_dict[field.name].setFixedHeight\ (self.view_dict[field.name].sizeHint().height()) - self.grid.addWidget(self.view_dict[field.name], x, y+1) + self.grid.addWidget(self.view_dict[field.name], x, y, 1, 2) def add_element_combo (self, field, x, y): self.error_label_dict[field.name] = ErrorLabel(self) @@ -1450,7 +1450,7 @@ class MainFrame(QtGui.QWidget): self.param_object['CheckOnly'] = CheckOnly print self.method_name, "$$$$$$$$$$$$$$$$" - print self.param_object +# print self.param_object if self.ClientObj.param_objects[self.method_name]['error'] and \ type(self.ClientObj.param_objects[self.method_name]['error']) \ diff --git a/console/gui/more.py b/console/gui/more.py index 7bc21e2..8fe862a 100755 --- a/console/gui/more.py +++ b/console/gui/more.py @@ -1621,7 +1621,6 @@ class ClientServiceThread(QtCore.QThread): return_except = False, sleeptime = None, \ through_object = None): QtCore.QThread.__init__(self) - print 'AAAAAAAAAAAAAAAA' self.ClientObj = ClientObj self.method_name = method_name self.parameters_object = parameters_object @@ -1631,11 +1630,9 @@ class ClientServiceThread(QtCore.QThread): self.sleeptime = sleeptime self.through_object = through_object - print 'BBBBBBBBBBBBBBBBB' self.close_flag = False def run(self): - print 'CCCCCCCCCCCCCCCCCC' client = self.ClientObj.client if self.sleeptime: try: @@ -1646,7 +1643,6 @@ class ClientServiceThread(QtCore.QThread): except TypeError: print 'TypeError Exception in class ClientServiceThread' - print 'DDDDDDDDDDDDDDDDDDDD' try: if self.second_params == None: result = client.service[0][self.method_name] \ @@ -1659,9 +1655,7 @@ class ClientServiceThread(QtCore.QThread): (self.parameters_object, self.second_params, \ self.third_params) - print 'EEEEEEEEEEEEEEEEEEEE' except Exception, e: - print 'FFFFFFFFFFFFFFFFFFFFf' if self.return_except: print "EMIT EXCEPTION!!!!!!!!" if self.close_flag: @@ -1674,7 +1668,6 @@ class ClientServiceThread(QtCore.QThread): else: print "EXCEPTION!!!!!!!!", e return - print 'GGGGGGGGGGGGGGGGGGGGGGG' if self.close_flag: return if self.through_object: @@ -1682,7 +1675,5 @@ class ClientServiceThread(QtCore.QThread): else: self.signal.emit(result) - print 'IIIIIIIIIIIIIIIIIIIII' - def close(self): self.close_flag = True