Implement the Path editor. (#82)

Extracts a view component from the room editor and uses it to create the path editor. Also installs it in the background editor.
enigma-dev · Jan 10, 2020 · 4b0c8aa · 4b0c8aa
1 parent ec88031
commit 4b0c8aa
Show file tree

Hide file tree

Showing 34 changed files with 1,783 additions and 389 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,10 +55,12 @@ set(RGM_SOURCES
     Components/Utility.cpp
     Components/RecentFiles.cpp
     Components/QMenuView.cpp
+    Widgets/AssetScrollAreaBackground.cpp
     Widgets/BackgroundView.cpp
     Widgets/CodeWidget.cpp
     Widgets/StackedCodeWidget.cpp
     Widgets/ColorPicker.cpp
+    Widgets/PathView.cpp
     Widgets/RoomView.cpp
     Widgets/AssetView.cpp
     Plugins/RGMPlugin.cpp
@@ -101,10 +103,13 @@ set(RGM_HEADERS
     Components/Utility.h
     Components/QMenuView.h
     Components/Logger.h
+    Widgets/AssetScrollArea.h
+    Widgets/AssetScrollAreaBackground.h
     Widgets/BackgroundView.h
     Widgets/CodeWidget.h
     Widgets/StackedCodeWidget.h
     Widgets/ColorPicker.h
+    Widgets/PathView.h
     Widgets/RoomView.h
     Widgets/AssetView.h
     Plugins/RGMPlugin.h

diff --git a/Editors/BackgroundEditor.cpp b/Editors/BackgroundEditor.cpp
@@ -9,9 +9,9 @@
 
 #include "gmx.h"
 
+#include <QDebug>
 #include <QDesktopServices>
 #include <QPainter>
-#include <QDebug>
 
 using buffers::resources::Background;
 
@@ -21,6 +21,8 @@ BackgroundEditor::BackgroundEditor(ProtoModelPtr model, QWidget* parent)
 
   connect(ui->actionSave, &QAction::triggered, this, &BaseEditor::OnSave);
 
+  ui->imagePreviewBackground->SetAssetView(ui->backgroundView);
+
   ui->backgroundView->SetResourceModel(resMapper->GetModel());
 
   resMapper->addMapping(ui->smoothCheckBox, Background::kSmoothEdgesFieldNumber);
@@ -43,15 +45,11 @@ void BackgroundEditor::dataChanged(const QModelIndex& topLeft, const QModelIndex
   ui->backgroundView->update();
 }
 
-void BackgroundEditor::on_actionZoomIn_triggered() {
-  ui->backgroundView->SetZoom(ui->backgroundView->GetZoom() * 2);
-}
+void BackgroundEditor::on_actionZoomIn_triggered() { ui->imagePreviewBackground->ZoomIn(); }
 
-void BackgroundEditor::on_actionZoomOut_triggered() {
-  ui->backgroundView->SetZoom(ui->backgroundView->GetZoom() / 2);
-}
+void BackgroundEditor::on_actionZoomOut_triggered() { ui->imagePreviewBackground->ZoomOut(); }
 
-void BackgroundEditor::on_actionZoom_triggered() { ui->backgroundView->SetZoom(1); }
+void BackgroundEditor::on_actionZoom_triggered() { ui->imagePreviewBackground->ResetZoom(); }
 
 void BackgroundEditor::on_actionNewImage_triggered() {
   QDialog dialog(this);
@@ -80,7 +78,9 @@ void BackgroundEditor::on_actionLoadImage_triggered() {
         // QString newData = GetModelData(Background::kImageFieldNumber).toString();
         // TODO: Copy data into our egm and reset the path
         // SetModelData(Background::kImageFieldNumber, lastData);
-      } else qDebug() << "Failed to load gmx Background";
+      } else {
+        qDebug() << "Failed to load gmx Background";
+      }
     } else {
       // TODO: Copy data into our egm
       SetModelData(Background::kImageFieldNumber, fName);

diff --git a/Editors/BackgroundEditor.ui b/Editors/BackgroundEditor.ui
@@ -355,20 +355,20 @@
       </layout>
      </item>
      <item>
-      <widget class="QScrollArea" name="imagePreview">
+      <widget class="AssetScrollArea" name="imagePreview">
        <property name="widgetResizable">
         <bool>true</bool>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
-       <widget class="QWidget" name="scrollAreaWidget">
+       <widget class="AssetScrollAreaBackground" name="imagePreviewBackground">
         <property name="geometry">
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>426</width>
-          <height>311</height>
+          <width>446</width>
+          <height>314</height>
          </rect>
         </property>
         <property name="autoFillBackground">
@@ -498,12 +498,24 @@
   </action>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>AssetScrollArea</class>
+   <extends>QScrollArea</extends>
+   <header>Widgets/AssetScrollArea.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BackgroundView</class>
    <extends>QWidget</extends>
    <header>Widgets/BackgroundView.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>AssetScrollAreaBackground</class>
+   <extends>QWidget</extends>
+   <header>Widgets/AssetScrollAreaBackground.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>

diff --git a/Editors/BaseEditor.cpp b/Editors/BaseEditor.cpp
@@ -13,6 +13,9 @@ BaseEditor::BaseEditor(ProtoModelPtr treeNodeModel, QWidget* parent)
   resMapper->GetModel()->BackupModel(this);
 
   connect(_model, &QAbstractItemModel::modelReset, [this]() { this->RebindSubModels(); });
+
+  connect(this, &BaseEditor::FocusGained, [=]() { hasFocus = true; });
+  connect(this, &BaseEditor::FocusLost, [=]() { hasFocus = false; });
 }
 
 void BaseEditor::closeEvent(QCloseEvent* event) {
@@ -38,6 +41,8 @@ void BaseEditor::closeEvent(QCloseEvent* event) {
   event->accept();
 }
 
+bool BaseEditor::HasFocus() { return hasFocus; }
+
 void BaseEditor::ReplaceBuffer(google::protobuf::Message* buffer) { resMapper->ReplaceBuffer(buffer); }
 
 void BaseEditor::SetModelData(int index, const QVariant& value) {

diff --git a/Editors/BaseEditor.h b/Editors/BaseEditor.h
@@ -20,13 +20,15 @@ class BaseEditor : public QWidget {
  public:
   explicit BaseEditor(ProtoModelPtr treeNodeModel, QWidget *parent);
 
-  virtual void closeEvent(QCloseEvent *event);
   void ReplaceBuffer(google::protobuf::Message *buffer);
   void SetModelData(int index, const QVariant &value);
   QVariant GetModelData(int index);
+  bool HasFocus();
 
  signals:
   void ResourceRenamed(TypeCase type, const QString &oldName, const QString &newName);
+  void FocusGained();
+  void FocusLost();
 
  public slots:
   virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
@@ -35,9 +37,12 @@ class BaseEditor : public QWidget {
   void OnSave();
 
  protected:
+  virtual void closeEvent(QCloseEvent *event) override;
+
   ModelMapper *nodeMapper;
   ModelMapper *resMapper;
   ProtoModelPtr _model;
+  bool hasFocus = false;
 };
 
 #endif  // BASEEDTIOR_H