Добавлена фильтрации сообщений для графического клиента.

consolegui/application/MainFrameResult.py

@@ -532,7 +532,7 @@ class MainFrameRes(QtGui.QWidget):
                 if self.get_Frame_thread.isRunning():
                     self.get_Frame_thread.wait()
             self.get_Frame_thread = ClientServiceThread(self.ClientObj,\
-                           'get_frame', sid, pid, return_except = True, \
+                           'get_frame', sid, pid, "gui",  return_except = True, \
                            through_object = (sid, pid))
             self.get_Frame_thread.signal_extended.connect(self.get_Frame_cycle)
             self.get_Frame_thread.start()
@@ -561,7 +561,7 @@ class MainFrameRes(QtGui.QWidget):
             else:
                 sleeptime = int(self.ClientObj.client.frame_period)
             self.get_Frame_thread = ClientServiceThread(self.ClientObj,
-                          'get_frame', sid, pid, return_except = True,
+                          'get_frame', sid, pid, "gui",return_except = True,
                           sleeptime = sleeptime,
                           through_object = (sid, pid))
             self.get_Frame_thread.signal_extended.connect(self.get_Frame_cycle)

consolegui/application/ShortFrameResult.py

@@ -370,7 +370,7 @@ class ShortFrameRes(QtGui.QWidget):
                 if self.get_Frame_thread.isRunning():
                     self.get_Frame_thread.wait()
             self.get_Frame_thread = ClientServiceThread(self.ClientObj,\
-                           'get_frame', sid, pid, return_except = True, \
+                           'get_frame', sid, pid, "gui", return_except = True, \
                            through_object = (sid, pid))
             self.get_Frame_thread.signal_extended.connect(self.get_Frame_cycle)
             self.get_Frame_thread.start()
@@ -396,7 +396,7 @@ class ShortFrameRes(QtGui.QWidget):
                 if self.get_Frame_thread.isRunning():
                     self.get_Frame_thread.wait()
             self.get_Frame_thread = ClientServiceThread(self.ClientObj,\
-                           'get_frame', sid, pid, return_except = True, \
+                           'get_frame', sid, pid, "gui", return_except = True, \
                            sleeptime = int(self.ClientObj.client.frame_period),\
                            through_object = (sid, pid))
             self.get_Frame_thread.signal_extended.connect(self.get_Frame_cycle)

consolegui/application/TrayIcon.py

@@ -106,8 +106,8 @@ class TrayUpdateSystem(QtCore.QThread):
                         self.mes_sig.emit('', _('Update aborted'))
                         return 0
                 try:
-                    current_frame = self._parent.localhost_ClientObj.client.\
-                                                 service.get_frame(sid, pid)
+                    client = self._parent.localhost_ClientObj.client
+                    current_frame = client.service.get_frame(sid, pid,"gui")
                 except urllib2.URLError:
                     _print ('client.service.get_entire_frame in'
                             ' TrayIcon Exception')

consolegui/application/more.py

@@ -2579,19 +2579,16 @@ def get_sid (client):
 class ClientServiceThread(QtCore.QThread):
     signal = QtCore.Signal(object)
     signal_extended = QtCore.Signal(object, object)
-    def __init__(self, ClientObj, method_name, parameters_object, \
-                 second_params = None, third_params = None, \
-                 return_except = False, sleeptime = None, \
-                 through_object = None):
+    def __init__(self, ClientObj, method_name, *args, **kwargs):
         QtCore.QThread.__init__(self)
         self.ClientObj = ClientObj
         self.method_name = method_name
-        self.parameters_object = parameters_object
-        self.second_params = second_params
-        self.third_params = third_params
-        self.return_except = return_except
-        self.sleeptime = sleeptime
-        self.through_object = through_object
+        self.args = args
+        # установка kwargs с провркой на лишние
+        self.return_except, self.sleeptime, self.through_object = \
+            (lambda return_except=False,sleeptime=None,
+                   through_object=None: 
+                   (return_except,sleeptime,through_object))(**kwargs)
         self.close_flag = False
 
     def run(self):
@@ -2606,17 +2603,7 @@ class ClientServiceThread(QtCore.QThread):
                 _print ('TypeError Exception in class ClientServiceThread')
 
         try:
-            if self.second_params == None:
-                result = client.service[0][self.method_name] \
-                                    (self.parameters_object)
-            elif self.third_params == None:
-                result = client.service[0][self.method_name] \
-                                  (self.parameters_object, self.second_params)
-            else:
-                result = client.service[0][self.method_name] \
-                                (self.parameters_object, self.second_params, \
-                                 self.third_params)
-
+            result = client.service[0][self.method_name](*self.args)
         except Exception, e:
             if self.return_except:
                 _print ("EMIT EXCEPTION!")