ArchitectureColoredPainting/EditorWidgetItem.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1473</width>
-    <height>1103</height>
+    <width>1124</width>
+    <height>1010</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -56,20 +56,7 @@
          <widget class="QWidget" name="LeftBar" native="true"/>
         </item>
         <item>
-         <widget class="PreviewWindow" name="Preview">
-          <property name="minimumSize">
-           <size>
-            <width>1080</width>
-            <height>1080</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>1080</width>
-            <height>1080</height>
-           </size>
-          </property>
-         </widget>
+         <widget class="PreviewWindow" name="Preview"/>
         </item>
         <item>
          <widget class="QWidget" name="RightBar" native="true">

ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp

@@ -59,11 +59,7 @@ EditorWidgetItem::~EditorWidgetItem()
 
 void EditorWidgetItem::paintEvent(QPaintEvent *event)
 {
-    QPainter painter(this);
 
-    // 设置画刷的颜色为灰色，并填充整个窗口区域
-    painter.setBrush(Qt::gray);
-    painter.drawRect(this->rect());
 }
 
 void EditorWidgetItem::onLayerChange(LayerWrapper *layer)

ArchitectureColoredPainting/src/Editor/GraphicElement.cpp

@@ -83,19 +83,4 @@ QJsonObject GraphicElement::toJson() const
 	QJsonObject result;
 	result.insert("name", name);
 	return result;
-}
-
-void SimpleElement::paint(QPainter* painter, QTransform transform, vector<std::shared_ptr<LayerStyle>> styles)
-{
-	Renderer::ElementStyleStrokeDemo demo(2);
-	auto [img, mov] = renderer->drawElement(painterPath, demo, 1.0);
-	painter->save();
-	painter->setTransform(transform);
-	painter->drawImage(mov, img);
-	painter->restore();
-}
-
-void GroupElement::paint(QPainter* painter, QTransform transform, vector<std::shared_ptr<LayerStyle>> styles)
-{
-	sourceLayer->paint(painter, transform);
 }

ArchitectureColoredPainting/src/Editor/GraphicElement.h

@@ -28,7 +28,6 @@ public:
 	virtual QJsonObject toJson() const;
     virtual PixelPath getPaintObject() const = 0;
     virtual PixelPath getPaintObject(std::vector<std::shared_ptr<LayerStyle>>*) const = 0;
-    virtual void paint(QPainter* painter, QTransform transform, std::vector<std::shared_ptr<LayerStyle>> styles) = 0;
 };
 
 class SimpleElement : public GraphicElement
@@ -45,7 +44,6 @@ public:
     ~SimpleElement() = default;
     PixelPath getPaintObject() const override;
     PixelPath getPaintObject(std::vector<std::shared_ptr<LayerStyle>>*) const override;
-    void paint(QPainter* painter, QTransform transform, std::vector<std::shared_ptr<LayerStyle>> styles) override;
 };
 
 class GroupElement : public GraphicElement
@@ -60,7 +58,6 @@ public:
     PixelPath getPaintObject() const override;
     PixelPath getPaintObject(std::vector<std::shared_ptr<LayerStyle>>*) const override;
     void setSourceLayer(FolderLayerWrapper* sourceLayer);
-    void paint(QPainter* painter, QTransform transform, std::vector<std::shared_ptr<LayerStyle>> styles) override;
 };
 
 //********************************  BitmapPath  ********************************//

ArchitectureColoredPainting/src/Editor/LayerManager.cpp

@@ -11,10 +11,10 @@ LayerWrapper *LayerManager::getRoot() const
 {
     return root;
 }
-void LayerManager::paint(QPainter *painter, QSize size,LayerWrapper* selecetedLayer) const
+void LayerManager::paint(QPainter *painter, QSize size) const
 {
-    root->getCache();
-    root->paint(painter);
+    auto p = root->getCache().resizedPixel(size);
+	painter->drawPixmap(0, 0, p);
 }
 bool LayerManager::singleSelectedCheck() const
 {

ArchitectureColoredPainting/src/Editor/LayerManager.h

@@ -32,7 +32,7 @@ class LayerManager
     LayerManager() = default;
 	LayerManager(QJsonObject source, ElementManager* elementManager);
 	QJsonObject toJson() const;
-    void paint(QPainter *painter, QSize size, LayerWrapper* selecetedLayer=nullptr) const;
+    void paint(QPainter *painter, QSize size) const;
     bool rename(QString newName) const;
     bool combine() const;
     // bool seperate() const;

ArchitectureColoredPainting/src/Editor/LayerWrapper.cpp

@@ -23,13 +23,9 @@ FolderLayerWrapper*LayerWrapper::getParent() const
     return this == nullptr ? nullptr : this->parent;
 }
 
-PixelPath LayerWrapper::getCache(LayerWrapper* selectedLayer)
+PixelPath LayerWrapper::getCache()
 {
-    this->refresh(selectedLayer);
-    if (selectedLayer == this)
-    {
-        this->cache.highLight();
-    }
+    this->refresh();
     return cache;
 }
 
@@ -46,7 +42,6 @@ LayerWrapper::LayerWrapper(QJsonObject json, FolderLayerWrapper*parent, ElementM
     property.scale = {transformJson.value("scale").toObject().value("x").toDouble(),
                       transformJson.value("scale").toObject().value("y").toDouble()};
     property.rotation = {transformJson.value("rotation").toDouble()};
-    selected = false;
 }
 
 FolderLayerWrapper::FolderLayerWrapper(QJsonObject json, ElementManager *elementManager, FolderLayerWrapper*parent)
@@ -80,52 +75,35 @@ LeafLayerWrapper::LeafLayerWrapper(QJsonObject json, ElementManager *elementMana
     int elementIndex = json.value("element").toInt();
     wrappedElement = elementManager->getElementById(elementIndex);
 }
-
-void LayerWrapper::SimpleProperty::apply(PixelPath&cache)
-{
-    transform.reset();
-    double centerX = cache.getBoundingRect().center().x();
-    double centerY = cache.getBoundingRect().center().y();
-    //qDebug() << name << "  " << cache.boundingRect().center();
-    //qDebug() << name << " " << cache.boundingRect();
-    transform.translate(-centerX, -centerY);
-    transform.translate(offset.x(), offset.y());
-    transform.rotate(rotation);
-    transform.scale(scale.x(), scale.y());
-    transform.translate(centerX, centerY);
-    cache = cache.trans(transform);
-}
-
-QTransform LayerWrapper::getTransform()
+void LayerWrapper::SimpleProperty::apply(PixelPath&cache) const
 {
     QTransform trans;
     double centerX = cache.getBoundingRect().center().x();
     double centerY = cache.getBoundingRect().center().y();
     //qDebug() << name << "  " << cache.boundingRect().center();
     //qDebug() << name << " " << cache.boundingRect();
-    trans.translate(centerX, centerY);
-    trans.translate(property.offset.x(), property.offset.y());
-    trans.rotate(property.rotation);
-    trans.scale(property.scale.x(), property.scale.y());
+    trans.translate(offset.x(), offset.y());
     trans.translate(-centerX, -centerY);
-    return trans;
+    trans.rotate(rotation);
+    trans.scale(scale.x(), scale.y());
+    trans.translate(centerX, centerY);
+    cache = cache.trans(trans);
 }
-
-void LayerWrapper::refresh(LayerWrapper* layer)
+void LayerWrapper::refresh()
 {
     property.apply(cache);
 }
 
-void FolderLayerWrapper::refresh(LayerWrapper* layer)
+void FolderLayerWrapper::refresh()
 {
     cache.clear();
     for (auto& child : children) {
-        cache.addPath(child.get()->getCache(layer));
+        cache.addPath(child.get()->getCache());
     }
     LayerWrapper::refresh();
 }
 
-void LeafLayerWrapper::refresh(LayerWrapper* layer)
+void LeafLayerWrapper::refresh()
 {
     cache.clear();
     if (wrappedElement != nullptr)
@@ -249,37 +227,4 @@ int FolderLayerWrapper::getReferencedBy()const
 		return this->elementManager->getLayerReferencedBy(this);
 	else
 		return -1;
-}
-
-void LayerWrapper::paint(QPainter* painter, QTransform transform)
-{
-    if (this->selected)
-    {
-        painter->save();
-		painter->setTransform(transform);
-		painter->setPen(QPen(Qt::gray, 2));
-        painter->setPen(Qt::DashLine);
-		painter->drawRect(cache.getBoundingRect());
-		painter->restore();
-    }
-}
-
-void FolderLayerWrapper::paint(QPainter* painter, QTransform transform)
-{
-    LayerWrapper::paint(painter, transform);
-    transform = property.transform * transform;
-    qDebug() << transform;
-	for (auto& child : children)
-		child->paint(painter, transform);
-}
-
-void LeafLayerWrapper::paint(QPainter* painter, QTransform transform)
-{
-    LayerWrapper::paint(painter, transform);
-    transform = property.transform * transform;
-    qDebug() << transform;
-	if (wrappedElement != nullptr)
-	{
-		wrappedElement->paint(painter, transform, styles);
-	}
 }

ArchitectureColoredPainting/src/Editor/LayerWrapper.h

@@ -35,7 +35,6 @@ class LayerWrapper
 
   public:
 	QTreeWidgetItem* qTreeWidgetItem;
-    bool selected;
     struct SimpleProperty
     {
         QString name = "";
@@ -44,20 +43,17 @@ class LayerWrapper
         double rotation = 0;
         bool flipHorizontally = 0;
         bool flipVertically = 0;
-        QTransform transform;
         // TODO: 将QPainterPath改为BitmapPath
-        void apply(PixelPath&cache);
+        void apply(PixelPath&cache) const;
     } property;
     virtual void setParent(FolderLayerWrapper*newParent);
-    virtual void refresh(LayerWrapper* layer = nullptr);
+    virtual void refresh();
     virtual QTreeWidgetItem* getQTreeItem();
     // TODO: 将QPainterPath改为BitmapPath/QImage，或者直接将其删除，绘制时直接使用BitmapPath的paint方法
-    virtual PixelPath getCache(LayerWrapper* selectedLayer=nullptr);
-    QTransform getTransform();
+    virtual PixelPath getCache();
     FolderLayerWrapper*getParent() const; // invoke by manager, then invoke parent's applyStyles
     LayerWrapper(QJsonObject json, FolderLayerWrapper*parent, ElementManager* elementManager=nullptr);
     LayerWrapper() = default;
-    virtual void paint(QPainter* painter, QTransform transform=QTransform());
     // TODO : export Function
     // virtual LayerWrapper *addChild() = 0;  // Leaf Child Only
     // virtual LayerWrapper *addParent() = 0; // Folder Parent Only
@@ -79,7 +75,7 @@ class FolderLayerWrapper : public LayerWrapper
   public:
 
       ~FolderLayerWrapper() = default;
-    void refresh(LayerWrapper* layer=nullptr) override;
+    void refresh() override;
     FolderLayerWrapper() = default;
     FolderLayerWrapper(QJsonObject json, ElementManager *elementManager, FolderLayerWrapper*parent);
     void addChild(shared_ptr<LayerWrapper> child);
@@ -90,7 +86,6 @@ class FolderLayerWrapper : public LayerWrapper
 	QTreeWidgetItem* getQTreeItem() override;
 	QJsonObject toJson() const override;
     int getReferencedBy()const;
-	void paint(QPainter* painter, QTransform transform = QTransform()) override;
 };
 
 class LeafLayerWrapper : public LayerWrapper
@@ -102,11 +97,10 @@ class LeafLayerWrapper : public LayerWrapper
 
   public:
 	  ~LeafLayerWrapper() = default;
-    void refresh(LayerWrapper* layer = nullptr) override;
+    void refresh() override;
     LeafLayerWrapper() = default;
     LeafLayerWrapper(QJsonObject json, ElementManager *elementManager, FolderLayerWrapper*parent);
     QJsonObject toJson() const override;
-	void paint(QPainter* painter, QTransform transform = QTransform()) override;
 };
 
 Q_DECLARE_METATYPE(LayerWrapper *)

ArchitectureColoredPainting/src/Editor/PixelPath.cpp

@@ -102,19 +102,4 @@ QPixmap PixelPath::getDetail()const
 	qDebug() << rect;
 	result = pixmap.copy(rect);
 	return result;
-}
-
-void PixelPath::highLight()
-{
-	// 创建一个QPainter对象，关联到QPixmap对象
-	QPainter painter(&pixmap);
-
-	// 设置画笔的颜色、宽度和样式
-	painter.setPen(QPen(Qt::black, 1, Qt::DashLine));
-
-	// 绘制一个矩形，指定左上角和右下角的坐标
-	painter.drawRect(boundingRect);
-
-	// 结束绘制
-	painter.end();
 }

ArchitectureColoredPainting/src/Editor/PixelPath.h

@@ -26,5 +26,4 @@ public:
 	PixelPath trans(QTransform& mat)const;
 	QPixmap resizedPixel(QSize size)const;
 	QPixmap getDetail()const;
-	void highLight();
 };

ArchitectureColoredPainting/src/Editor/PreviewWindow.cpp

@@ -2,7 +2,6 @@
 
 PreviewWindow::PreviewWindow(QWidget *parent) : QOpenGLWidget(parent)
 {
-    this->setFixedSize(QSize(1080, 1080));
     this->renderer = Renderer::ElementRenderer::instance();
     QSurfaceFormat surfaceFormat;
     surfaceFormat.setSamples(16);
@@ -48,7 +47,15 @@ void PreviewWindow::paintGL()
     painter->begin(this);
     painter->setRenderHint(QPainter::Antialiasing);
     painter->setRenderHint(QPainter::HighQualityAntialiasing);
-    layerManager->paint(painter,this->size(),currentLayer);
+    layerManager->paint(painter,this->size());
+    if (currentLayer != nullptr)
+    {
+        QPen pen = painter->pen(); // 获取当前的画笔
+        pen.setStyle(Qt::DashLine); // 设置画笔样式为虚线
+        painter->setPen(pen); // 应用画笔设置
+        painter->drawRect(this->currentLayer->getCache().getBoundingRect()); // 绘制矩形
+    }
+
     painter->end();
 }
 

ArchitectureColoredPainting/src/Editor/RightBar/LayerTreeWidget.cpp

@@ -12,13 +12,9 @@ LayerTreeWidget::LayerTreeWidget(QWidget *parent)
     this->setHeaderLabel("Layer Content");
     connect(this, &QTreeWidget::customContextMenuRequested, this, &LayerTreeWidget::popMenu);
     connect(this, &QTreeWidget::currentItemChanged, [=](QTreeWidgetItem *currentItem) {
-        if (this->selectedItem != nullptr) {
-            this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper*>()->selected = false;
-        }
         this->selectedItem = currentItem;
         if (this->selectedItem != nullptr) {
             auto layer = this->selectedItem->data(0, Qt::UserRole).value<LayerWrapper*>();
-            layer->selected = true;
             emit displayLayerChange(layer);
         }    
         else {