Merge lp:~jhodapp/qtubuntu/qtubuntu_add-live-orientation into lp:qtubuntu

[Jim Hodapp]

* Implements live orientation support for client applications using the QtSensors OrientationSensor backend.
* Add qtsensors5-dev as a package build dependency.
* Update the binary package dependencies to include the sensor related libraries.

* Implements live orientation support for client applications using the QtSensors OrientationSensor backend.
* Add qtsensors5-dev as a package build dependency.
* Update the binary package dependencies to include the sensor related libraries.

[lp:~jhodapp/qtubuntu/qtubuntu_add-live-orientation]

118. By Jim Hodapp on 2013-02-27

Don't need to include QObject header file in base/screen.h

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/208/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/208/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/208//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/209/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/209/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/209//rebuild/?

review: Approve (continuous-integration)

[lp:~jhodapp/qtubuntu/qtubuntu_add-live-orientation]

119. By Jim Hodapp on 2013-02-28

Fix compile error when setting debug config via: qmake CONFIG+=debug

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/210/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/210//rebuild/?

review: Approve (continuous-integration)

[Loïc Molinari (loic.molinari)]

Hi Jim,

That is good, code is working well.

I only have a few coding style remarks, it's not written anywhere in the project but QtUbuntu respects the coding guidelines from Google (http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml):

- Not sure about the "Depends" change in debian/control, might need to be validated by ricmm.

- No need to test for orientationSensor_ validity in ~QUbuntuScreen, just delete it. "delete" takes care of NULL pointers and the sensor is stopped in its destructor.

 - Add DLOGs in OrientationReadingEvent constructor and destructor as it's done in src/modules/application/application_image.cc for instance.

 - Add DLOGs in onOrientationReadingChanged() and customEvent() at the beginning as it's done in every other methods.

 - I think using a single switch in customEvent() would make the code easier to read and maintain (also Google coding guidelines recommend to use brackets for cases, 2 spaces indentation, 4 spaces line wrap), something like that:

  switch (oReadingEvent->orientation_) {
    case QOrientationReading::LeftUp: {
      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
          Qt::InvertedPortraitOrientation : Qt::LandscapeOrientation;;
      break;
    }
    case ...
  }

 - QtUbuntu uses full include paths for Qt5 classes (QtCore/QObject, QtSensors/QOrientationSensor, QtGui/QScreen, QtCore/QThread, etc). If you don't know where a class is located, "find /usr/include/qt5 -name QFoo" can help you.

 - Open curly brace should be on the same line than the last parameter of a function or the last initialization parameter of a constructor (see lines 47, 87, 98 and 143 in screen.cc). Google coding guidelines recommend Egyptian brackets (http://www.codinghorror.com/blog/2012/07/new-programming-jargon.html).

 - "Qt::ScreenOrientation QUbuntuScreen::orientation() const" should be defined in the header.

 - Bad indentation in QUbuntuScreen: QOBJECT macro and methods should be indented 2 spaces, private, public and protected keywords should be indented 1 space.

 - For pointer declarations, space is following the asterisk.

 - I'd remove the comment on line 73 in screen.cc, code is explicit enough.

review: Needs Fixing

[lp:~jhodapp/qtubuntu/qtubuntu_add-live-orientation]

120. By Jim Hodapp on 2013-03-01

Code [style] cleanup per a merge request review by loicm.

[Loïc Molinari (loic.molinari)]

Excellent, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/211/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/211/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/211//rebuild/?

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-02-12 16:56:42 +0000
+++ debian/control	2013-03-01 14:53:21 +0000
@@ -15,7 +15,8 @@
                 libfontconfig1-dev,
                 libfreetype6-dev,
                 libdbus-1-dev,
-                libatspi2.0-dev
+                libatspi2.0-dev,
+                qtsensors5-dev
 Standards-Version: 3.9.3
 Section: libs
 
@@ -24,7 +25,10 @@
 Breaks: qthybris (<< 0.37)
 Section: libs
 Architecture: armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+         libqt5sensors5,
+         qtubuntu-sensors[armel],
+         qtubuntu-sensors[armhf],
 Description: Qt plugins for Ubuntu Platform API
  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It
  contains a QPA (Qt Platform Abstraction) plugin based on the Ubuntu

=== modified file 'src/platforms/ubuntu/screen.cc'
--- src/platforms/ubuntu/screen.cc	2013-02-26 01:03:00 +0000
+++ src/platforms/ubuntu/screen.cc	2013-03-01 14:53:21 +0000
@@ -17,9 +17,32 @@
 
 #include "screen.h"
 #include "base/logging.h"
+#include <QtCore/QCoreApplication>
 #include <QtCore/qmath.h>
+#include <QtSensors/QOrientationSensor>
+#include <QtSensors/QOrientationReading>
+#include <QtGui/QScreen>
+#include <QtCore/QThread>
+#include <qpa/qwindowsysteminterface.h>
 #include <ubuntu/application/ui/ubuntu_application_ui.h>
 
+class OrientationReadingEvent : public QEvent {
+ public:
+  OrientationReadingEvent(QEvent::Type type, QOrientationReading::Orientation orientation)
+      : QEvent(type)
+      , orientation_(orientation) {
+    DLOG("OrientationReadingEvent::OrientationReadingEvent()");
+  }
+  ~OrientationReadingEvent() {
+    DLOG("OrientationReadingEvent::~OrientationReadingEvent()");
+  }
+  static const QEvent::Type type_;
+  QOrientationReading::Orientation orientation_;
+};
+
+const QEvent::Type OrientationReadingEvent::type_ =
+    static_cast<QEvent::Type>(QEvent::registerEventType());
+
 // Grid unit used if GRID_UNIT_PX is not in the environment.
 const int kDefaultGridUnit = 8;
 
@@ -79,11 +102,20 @@
   DLOG("QUbuntuScreen::QUbuntuScreen (this=%p)", this);
 
   // Set the default orientation based on the initial screen dimmensions.
-  nativeOrientation_ = kScreenWidth >= kScreenHeight ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
+  nativeOrientation_ = (kScreenWidth >= kScreenHeight) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
+
+  // If it's a landscape device (i.e. some tablets), start in landscape, otherwise portrait
+  currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
+
+  orientationSensor_ = new QOrientationSensor();
+  QObject::connect(orientationSensor_, SIGNAL(readingChanged()), this, SLOT(onOrientationReadingChanged()));
+  orientationSensor_->start();
 }
 
 QUbuntuScreen::~QUbuntuScreen() {
   DLOG("QUbuntuScreen::~QUbuntuScreen");
+
+  delete orientationSensor_;
 }
 
 int QUbuntuScreen::gridUnitToPixel(int value) const {
@@ -100,3 +132,47 @@
     return static_cast<int>(qRound(value * densityPixelRatio_));
   }
 }
+
+void QUbuntuScreen::customEvent(QEvent* event) {
+  DLOG("QUbuntuScreen::customEvent (event: %p)", event);
+  DASSERT(QThread::currentThread() == thread());
+
+  OrientationReadingEvent* oReadingEvent = static_cast<OrientationReadingEvent*>(event);
+  switch (oReadingEvent->orientation_) {
+    case QOrientationReading::LeftUp: {
+      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
+          Qt::InvertedPortraitOrientation : Qt::LandscapeOrientation;
+      break;
+    }
+    case QOrientationReading::TopUp: {
+      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
+          Qt::LandscapeOrientation : Qt::PortraitOrientation;
+      break;
+    }
+    case QOrientationReading::RightUp: {
+      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
+          Qt::PortraitOrientation : Qt::InvertedLandscapeOrientation;
+      break;
+    }
+    case QOrientationReading::TopDown: {
+      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
+          Qt::InvertedLandscapeOrientation : Qt::InvertedPortraitOrientation;
+      break;
+    }
+    default: {
+      DLOG("Unknown orientation.");
+    }
+  }
+
+  // Raise the event signal so that client apps know the orientation changed
+  QWindowSystemInterface::handleScreenOrientationChange(screen(), currentOrientation_);
+}
+
+void QUbuntuScreen::onOrientationReadingChanged() {
+  DLOG("QUbuntuScreen::onOrientationReadingChanged");
+  DASSERT(orientationSensor_ != NULL);
+
+  // Make sure to switch to the main Qt thread context
+  QCoreApplication::postEvent(this, new OrientationReadingEvent(
+                                OrientationReadingEvent::type_, orientationSensor_->reading()->orientation()));
+}

=== modified file 'src/platforms/ubuntu/screen.h'
--- src/platforms/ubuntu/screen.h	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntu/screen.h	2013-03-01 14:53:21 +0000
@@ -18,7 +18,12 @@
 
 #include "base/screen.h"
 
-class QUbuntuScreen : public QUbuntuBaseScreen {
+#include <QObject>
+
+class QOrientationSensor;
+
+class QUbuntuScreen : public QObject, public QUbuntuBaseScreen {
+  Q_OBJECT
  public:
   QUbuntuScreen();
   ~QUbuntuScreen();
@@ -28,15 +33,24 @@
   QRect availableGeometry() const { return availableGeometry_; }
 
   Qt::ScreenOrientation nativeOrientation() const { return nativeOrientation_; }
+  Qt::ScreenOrientation orientation() const { return currentOrientation_; }
   int gridUnitToPixel(int value) const;
   int densityPixelToPixel(int value) const;
 
+  // QObject methods.
+  void customEvent(QEvent* event);
+
+ public Q_SLOTS:
+    void onOrientationReadingChanged();
+
  private:
   QRect geometry_;
   QRect availableGeometry_;
   int gridUnit_;
   float densityPixelRatio_;
   Qt::ScreenOrientation nativeOrientation_;
+  Qt::ScreenOrientation currentOrientation_;
+  QOrientationSensor* orientationSensor_;
 };
 
 #endif  // QUBUNTUSCREEN_H

=== modified file 'src/platforms/ubuntu/ubuntu.pro'
--- src/platforms/ubuntu/ubuntu.pro	2013-02-07 13:54:11 +0000
+++ src/platforms/ubuntu/ubuntu.pro	2013-03-01 14:53:21 +0000
@@ -1,7 +1,7 @@
 TARGET = qubuntu
 TEMPLATE = lib
 
-QT += core-private gui-private platformsupport-private
+QT += core-private gui-private platformsupport-private sensors-private
 
 DEFINES += MESA_EGL_NO_X11_HEADERS
 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden