Fix follow camera import image option

There were two issues with this feature. First was that it was
importing with the camera view transform, but the camera rect is
actually transformed by the inverse of that transformation.

The second issue was an occasional off-by-one error in the position
caused by using the more accurate qtransform over the rounded qrect
that the camera rect is based off of.

Author: scribblemaniac

app/src/importpositiondialog.cpp

@@ -76,7 +76,7 @@ void ImportPositionDialog::changeImportView()
     }
     else if (mImportOption == ImportPosition::Type::CenterOfCamera)
     {
-        QRectF cameraRect = mEditor->getScribbleArea()->getCameraRect();
+        QRectF cameraRect = mEditor->getScribbleArea()->getCameraRect(); // Must be QRectF for the precision of cameraRect.center()
         transform = transform.fromTranslate(cameraRect.center().x(), cameraRect.center().y());
         mEditor->view()->setImportView(transform);
         QSettings settings(PENCIL2D, PENCIL2D);

core_lib/src/graphics/bitmap/bitmapbucket.cpp

@@ -30,7 +30,7 @@ BitmapBucket::BitmapBucket()
 
 BitmapBucket::BitmapBucket(Editor* editor,
                            QColor color,
-                           QRectF maxFillRegion,
+                           QRect maxFillRegion,
                            QPointF fillPoint,
                            Properties properties):
     mEditor(editor),
@@ -125,7 +125,7 @@ void BitmapBucket::paint(const QPointF updatedPoint, std::function<void(BucketSt
     QRgb fillColor = mBucketColor;
 
     const QPoint point = QPoint(qFloor(updatedPoint.x()), qFloor(updatedPoint.y()));
-    const QRect cameraRect = mMaxFillRegion.toRect();
+    const QRect cameraRect = mMaxFillRegion;
     const int tolerance = mProperties.toleranceEnabled ? static_cast<int>(mProperties.tolerance) : 0;
     const int currentFrameIndex = mEditor->currentFrame();
     const QRgb origColor = fillColor;

core_lib/src/graphics/bitmap/bitmapbucket.h

@@ -35,7 +35,7 @@ class BitmapBucket
 {
 public:
     explicit BitmapBucket();
-    explicit BitmapBucket(Editor* editor, QColor color, QRectF maxFillRegion, QPointF fillPoint, Properties properties);
+    explicit BitmapBucket(Editor* editor, QColor color, QRect maxFillRegion, QPointF fillPoint, Properties properties);
 
     /** Will paint at the given point, given that it makes sense.. canUse is always called prior to painting
      *
@@ -71,7 +71,7 @@ class BitmapBucket
     QRgb mAppliedColor = 0;
 
     QPointF mBucketStartPoint;
-    QRectF mMaxFillRegion;
+    QRect mMaxFillRegion;
 
     int mTargetFillToLayerIndex = -1;
 

core_lib/src/interface/editor.cpp

@@ -918,8 +918,8 @@ bool Editor::importImage(const QString& filePath)
 
     if (view()->getImportFollowsCamera())
     {
-        LayerCamera* camera = static_cast<LayerCamera*>(layers()->getLastCameraLayer());
-        QTransform transform = camera->getViewAtFrame(currentFrame());
+        QRectF cameraRect = mScribbleArea->getCameraRect(); // Must be QRectF for the precision of cameraRect.center()
+        QTransform transform = QTransform::fromTranslate(cameraRect.center().x(), cameraRect.center().y());
         view()->setImportView(transform);
     }
     switch (layer->type())

core_lib/src/interface/scribblearea.cpp

@@ -1327,7 +1327,7 @@ void ScribbleArea::prepOverlays()
     o.bTitleSafe = mPrefs->isOn(SETTING::TITLE_SAFE_ON);
     o.nTitleSafe = mPrefs->getInt(SETTING::TITLE_SAFE);
 
-    o.mRect = getCameraRect().toRect();   // camera rect!
+    o.mRect = getCameraRect();   // camera rect!
     o.mSinglePerspPoint = mEditor->overlays()->getSinglePerspPoint();
     o.mLeftPerspPoint = mEditor->overlays()->getLeftPerspPoint();
     o.mRightPerspPoint = mEditor->overlays()->getRightPerspPoint();
@@ -1423,7 +1423,7 @@ void ScribbleArea::drawPolyline(QPainterPath path, QPen pen, bool useAA)
 /************************************************************************************/
 // view handling
 
-QRectF ScribbleArea::getCameraRect()
+QRect ScribbleArea::getCameraRect()
 {
     return mCanvasPainter.getCameraRect();
 }

core_lib/src/interface/scribblearea.h

@@ -84,7 +84,7 @@ class ScribbleArea : public QWidget
     bool usePressure() const { return mUsePressure; }
     bool makeInvisible() const { return mMakeInvisible; }
 
-    QRectF getCameraRect();
+    QRect getCameraRect();
     QPointF getCentralPoint();
 
     /** Update current frame.

tests/src/test_bitmapbucket.cpp

@@ -15,7 +15,7 @@
 
 #include "basetool.h"
 
-void dragAndFill(QPointF movePoint, Editor* editor, QColor color, QRectF bounds, Properties properties) {
+void dragAndFill(QPointF movePoint, Editor* editor, QColor color, QRect bounds, Properties properties) {
     int moveX = 0;
 
     BitmapBucket bucket = BitmapBucket(editor, color, bounds, movePoint, properties);