Merge remote-tracking branch 'origin/master' into master3.1.6

consolegui/application/CertificateClass.py

@@ -201,7 +201,8 @@ class CertClass (QtGui.QWidget):
         cert_path = self.default_cert_path
         if not os.path.exists(cert_path + 'req_id'):
             show_msg (_("Request not sent, or file %s deleted") \
-                                                %(cert_path + 'req_id'), self)
+                                                %(cert_path + 'req_id'),
+                                                _("Certificates"), self)
             return 1
         fc = open(cert_path + 'req_id', 'r')
         req_id = fc.read()

consolegui/application/MainFrameResult.py

@@ -537,9 +537,8 @@ class MainFrameRes(QtGui.QWidget):
     def get_Frame_cycle(self, current_frame, through_object):
         if type(current_frame) == Exception:
             _print (_("Failed to get a frame from the server."))
-            show_msg(_("Failed to get a frame from the server.") +'\n'+ \
-                     _('Try resfeshing this page later.'),'get frame error')
-            return 1
+            #show_msg(_("Failed to get a frame from the server.") +'\n'+ \
+            #         _('Try resfeshing this page later.'),'get frame error')
         sid, pid = through_object
         if current_frame in [None, [], ""]:
             try:
@@ -547,7 +546,7 @@ class MainFrameRes(QtGui.QWidget):
                     return 1
             except:
                 return 1
-        else:
+        elif not isinstance(current_frame,Exception):
             self.get_Frame_after(current_frame, sid, pid)
         if self.not_end_frame:
             # Call server method
@@ -659,13 +658,26 @@ class MainFrameRes(QtGui.QWidget):
         self.get_Progress_thread.start()
 
     def get_Progress_cycle(self, returnProgr, through_object):
+        sid, pid, id, temp_progress, progressBar = through_object
+        def nextProgress():
+            if hasattr (self, 'get_Progress_thread'):
+                if self.get_Progress_thread.isRunning():
+                    self.get_Progress_thread.wait()
+            self.get_Progress_thread = ClientServiceThread(self.ClientObj,\
+                           'get_progress', sid, pid, id, return_except = True,\
+                           sleeptime = 1, through_object = \
+                           (sid, pid, id, temp_progress, progressBar))
+            self.get_Progress_thread.signal_extended.connect \
+                                                    (self.get_Progress_cycle)
+            self.get_Progress_thread.start()
+
         if type(returnProgr) == Exception:
             _print (_('Failed to get the progress status from the server'))
 #            show_msg(_('Failed to get the progress status from the server') + \
 #                    '\n'+ \
 #                   _('Try resfeshing this page later.'),'get progress error')
+            nextProgress()
             return 1
-        sid, pid, id, temp_progress, progressBar = through_object
 ########################################
         try:
             percent = returnProgr.percent
@@ -691,17 +703,7 @@ class MainFrameRes(QtGui.QWidget):
                 return 1
 
             # Call server method
-            if hasattr (self, 'get_Progress_thread'):
-                if self.get_Progress_thread.isRunning():
-                    self.get_Progress_thread.wait()
-            self.get_Progress_thread = ClientServiceThread(self.ClientObj,\
-                           'get_progress', sid, pid, id, return_except = True,\
-                           sleeptime = 1, through_object = \
-                           (sid, pid, id, temp_progress, progressBar))
-            self.get_Progress_thread.signal_extended.connect \
-                                                    (self.get_Progress_cycle)
-            self.get_Progress_thread.start()
-
+            nextProgress()
         if percent < 0:
             progressBar.setMaximum(100)
             returnProgr.percent = 0 - percent

consolegui/datavars.py

@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "3.0.2"
+__version__ = "3.1.6"
 __app__ = "Calculate Console"
 
 from calculate.lib.datavars import DataVars

setup.py

@@ -50,7 +50,7 @@ for size in [16,22,24,48,64,72,96,128]:
 
 var_data_files = []
 
-__version__ = "3.1.4"
+__version__ = "3.1.6"
 __app__ = "calculate-console-gui"
 
 class cl_console_data(install_data):