From 1c6aebdcbe08dedd424ea776d990de009e8bd5b0 Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Sun, 21 Jun 2020 18:33:41 +0100
Subject: [PATCH] Move the world transform code to its own function

It seems like something that could come in handy elsewhere when drawing
stuff to the viewer.
---
 app/widget/viewer/viewerdisplay.cpp | 41 ++++++++++++++++-------------
 app/widget/viewer/viewerdisplay.h   |  6 +++++
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp
index 1ceb97c8f..c0d3dd858 100644
--- a/app/widget/viewer/viewerdisplay.cpp
+++ b/app/widget/viewer/viewerdisplay.cpp
@@ -175,6 +175,28 @@ FramePtr ViewerDisplayWidget::last_loaded_buffer() const
   return last_loaded_buffer_;
 }
 
+QTransform ViewerDisplayWidget::GenerateWorldTransform()
+{
+  /*
+   * Get matrix elements (roughly) as below in column major order
+   *
+   * | Sx 0  0  Tx |
+   * | 0  Sy 0  Ty |
+   * | 0  0  Sz Tz |
+   * | 0  0  0  1  |
+   */
+  float *data = GetCompleteMatrix().data();
+  QTransform world;
+  // Move corner of canvas to correct point
+  world.translate(width() * 0.5 - width() * *(data)*0.5, height() * 0.5 - height() * *(data + 5) * 0.5);
+  // Scale
+  world.scale(*(data), *(data + 5));
+  // Translate for mouse movement
+  world.translate(*(data + 12) * width() * 0.5 / *(data), *(data + 13) * height() * -0.5 / *(data + 5));
+
+  return world;
+}
+
 void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event)
 {
   if (gizmos_
@@ -313,24 +335,7 @@ void ViewerDisplayWidget::paintGL()
 
   }
 
-  /*
-  * Get matrix elements (roughly) as below in column major order
-  *
-  * | Sx 0  0  Tx |
-  * | 0  Sy 0  Ty |
-  * | 0  0  Sz Tz |
-  * | 0  0  0  1  |
-  */
-  float *data = GetCompleteMatrix().data();
-  QTransform world;
-  // Move corner of canvas to correct point
-  world.translate(width() * 0.5 - width() * *(data)*0.5,
-                  height() * 0.5 - height() * *(data + 5) * 0.5);
-  // Scale
-  world.scale(*(data), *(data + 5));
-  // Translate for mouse movement
-  world.translate(*(data + 12) * width() * 0.5 / *(data),
-                  *(data + 13) * height() * -0.5 / *(data + 5));
+  QTransform world = GenerateWorldTransform();
 
   // Draw gizmos if we have any
   if (gizmos_) {
diff --git a/app/widget/viewer/viewerdisplay.h b/app/widget/viewer/viewerdisplay.h
index fed5febb4..7d6a5502e 100644
--- a/app/widget/viewer/viewerdisplay.h
+++ b/app/widget/viewer/viewerdisplay.h
@@ -87,6 +87,12 @@ public:
 
   FramePtr last_loaded_buffer() const;
 
+  /**
+   * @brief Return a QTransform that contains all the scale and translation data (inc. mouse drags)
+   * that can be used to set the world transform for a QPainter.
+   */
+  QTransform GenerateWorldTransform();
+
 public slots:
   /**
    * @brief Set the transformation matrix to draw with