qmlui: add support for 2D view background picture

mcallegari · Nov 5, 2023 · 6acd398 · 6acd398
1 parent 5084c9f
commit 6acd398
Show file tree

Hide file tree

Showing 8 changed files with 218 additions and 111 deletions.
diff --git a/qmlui/contextmanager.cpp b/qmlui/contextmanager.cpp
@@ -222,6 +222,16 @@ QString ContextManager::currentContext() const
     return m_view->rootObject()->property("currentContext").toString();
 }
 
+MainView2D *ContextManager::get2DView()
+{
+    return m_2DView;
+}
+
+MainView3D *ContextManager::get3DView()
+{
+    return m_3DView;
+}
+
 QVector3D ContextManager::environmentSize() const
 {
     return m_monProps->gridSize();

diff --git a/qmlui/contextmanager.h b/qmlui/contextmanager.h
@@ -79,6 +79,9 @@ class ContextManager : public QObject
     /** Return the currently active context */
     QString currentContext() const;
 
+    MainView2D *get2DView();
+    MainView3D *get3DView();
+
     /** Get/Set the environment width/height/depth size */
     QVector3D environmentSize() const;
     void setEnvironmentSize(QVector3D environmentSize);

diff --git a/qmlui/mainview2d.cpp b/qmlui/mainview2d.cpp
@@ -760,6 +760,24 @@ void MainView2D::setPointOfView(int pointOfView)
     slotRefreshView();
 }
 
+QString MainView2D::backgroundImage()
+{
+    return m_monProps->commonBackgroundImage();
+}
+
+void MainView2D::setBackgroundImage(QString image)
+{
+    QString strippedPath = image.replace("file://", "");
+    QString currentImage = m_monProps->commonBackgroundImage();
+
+    if (strippedPath == currentImage)
+        return;
+
+    Tardis::instance()->enqueueAction(Tardis::EnvironmentBackgroundImage, 0, QVariant(currentImage), QVariant(strippedPath));
+    m_monProps->setCommonBackgroundImage(strippedPath);
+    emit backgroundImageChanged();
+}
+
 
 
 

diff --git a/qmlui/mainview2d.h b/qmlui/mainview2d.h
@@ -40,6 +40,7 @@ class MainView2D : public PreviewContext
     Q_PROPERTY(qreal gridScale READ gridScale WRITE setGridScale NOTIFY gridScaleChanged)
     Q_PROPERTY(qreal cellPixels READ cellPixels WRITE setCellPixels NOTIFY cellPixelsChanged)
     Q_PROPERTY(int pointOfView READ pointOfView WRITE setPointOfView NOTIFY pointOfViewChanged)
+    Q_PROPERTY(QString backgroundImage READ backgroundImage WRITE setBackgroundImage NOTIFY backgroundImageChanged)
 
 public:
     explicit MainView2D(QQuickView *view, Doc *doc, QObject *parent = 0);
@@ -114,6 +115,10 @@ class MainView2D : public PreviewContext
     int pointOfView() const;
     void setPointOfView(int pointOfView);
 
+    /** Get/Set the main background image */
+    QString backgroundImage();
+    void setBackgroundImage(QString image);
+
 protected:
     /** First time 2D view variables initializations */
     bool initialize2DProperties();
@@ -128,6 +133,7 @@ class MainView2D : public PreviewContext
     void gridScaleChanged(qreal gridScale);
     void cellPixelsChanged(qreal cellPixels);
     void pointOfViewChanged(int pointOfView);
+    void backgroundImageChanged();
 
 public slots:
     /** @reimp */

diff --git a/qmlui/qml/fixturesfunctions/2DView.qml b/qmlui/qml/fixturesfunctions/2DView.qml
@@ -80,6 +80,7 @@ Rectangle
       * The stacking order of this view is very important and delicate
       * From bottom to top:
       * Flickable (z = 1): main scrollable area
+      *   Image (z = 0): Main background image
       *   Canvas (z = 0): The actual grid graphics view
       *     DropArea (z = 0): allow to drop items from fixture browser
       *     Rectangle (z = 1): multiple drag layer as big as the Canvas layer
@@ -142,6 +143,17 @@ Rectangle
                 twoDContents.requestPaint()
         }
 
+        Image
+        {
+            x: twoDContents.xOffset
+            y: twoDContents.yOffset
+            width: twoDView.contentWidth - (x * 2)
+            height: twoDView.contentHeight - (y * 2)
+            source: View2D.backgroundImage ? "file://" + View2D.backgroundImage : ""
+            sourceSize: Qt.size(width, height)
+            fillMode: Image.PreserveAspectFit
+        }
+
         Canvas
         {
             id: twoDContents
@@ -175,14 +187,15 @@ Rectangle
                 var context = getContext("2d")
                 context.globalAlpha = 1.0
                 context.strokeStyle = "#5F5F5F"
-                context.fillStyle = "black"
+                context.fillStyle = "transparent"
                 context.lineWidth = 1
 
                 context.beginPath()
                 context.clearRect(0, 0, width, height)
                 context.fillRect(0, 0, width, height)
                 context.rect(xOffset, yOffset, width - (xOffset * 2), height - (yOffset * 2))
 
+                // draw the view grid
                 for (var vl = 1; vl < twoDView.gridSize.width; vl++)
                 {
                     var xPos = (cellSize * vl) + xOffset