Merge lp:~kissiel/checkbox/error-logging-in-cbt-fixes into lp:checkbox

[Maciej Kisielewski]

This MR fixes various problems with error loging in checkbox-converged.

3dcdf43 checkbox-touch: fix errorPopup rendering
0324544 checkbox-touch: display error popup when session cannot be started
fe95718 checkbox-touch: handle failed object creation in PythonObjectRef

[Zygmunt Krynicki (zyga)]

Looks good, a bit weird on the indent in the middle patch but this aint python, +1

review: Approve

=== modified file 'checkbox-touch/components/CheckboxTouchApplication.qml'
--- checkbox-touch/components/CheckboxTouchApplication.qml	2015-07-23 08:25:48 +0000
+++ checkbox-touch/components/CheckboxTouchApplication.qml	2015-07-30 06:03:43 +0000
@@ -51,6 +51,10 @@
             sessionReady();
         }, function(error) {
             console.error("Unable to start session: " + error);
+            ErrorLogic.showError(mainView,
+                                 i18n.tr("Could not start a session.  Reason:\n" + error),
+                                 Qt.quit,
+                                 i18n.tr("Quit"));
         });
     }
     function resumeSession(rerunLastTest, providersDir, continuation) {

=== modified file 'checkbox-touch/components/ErrorDialog.qml'
--- checkbox-touch/components/ErrorDialog.qml	2014-11-11 05:46:42 +0000
+++ checkbox-touch/components/ErrorDialog.qml	2015-07-30 06:03:43 +0000
@@ -58,8 +58,6 @@
 
         Dialog {
             id: dlg
-            width: errorDialog.width
-            height: errorDialog.height
             title: i18n.tr("Error encountered")
 
             Label {

=== modified file 'checkbox-touch/components/PythonObjectRef.qml'
--- checkbox-touch/components/PythonObjectRef.qml	2015-05-27 06:51:12 +0000
+++ checkbox-touch/components/PythonObjectRef.qml	2015-07-30 06:03:43 +0000
@@ -42,9 +42,15 @@
         } else {
             console.info("Getting reference to python object via " + creationMethodName);
             py.call(creationMethodName, args, function(result) {
-                object = result;
-                pythonObjectRef.creationMethodName = creationMethodName;
-                objectReady();
+                if (!result) {
+                    var msg = "Object construction failed. " + creationMethodName + " did not return a valid object";
+                    console.error(msg);
+                    throw msg;
+                } else {
+                    object = result;
+                    pythonObjectRef.creationMethodName = creationMethodName;
+                    objectReady();
+                }
             });
         }
     }