添加项目信息管理器

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj

@@ -104,6 +104,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\Editor\DataManager\ProjectDataManager.cpp" />
     <ClCompile Include="src\Editor\EditorWidgetComponent\FillStyleWidget.cpp" />
     <ClCompile Include="src\Editor\RightBar\EditorSettingWidget.cpp" />
     <ClCompile Include="src\Editor\EditorWidgetComponent\ColorPicker.cpp" />
@@ -202,6 +203,7 @@
     <QtMoc Include="src\Editor\EditorWidgetComponent\ColorPicker.h" />
     <QtMoc Include="src\Editor\RightBar\EditorSettingWidget.h" />
     <QtMoc Include="src\Editor\EditorWidgetComponent\FillStyleWidget.h" />
+    <ClInclude Include="src\Editor\DataManager\ProjectDataManager.h" />
     <ClInclude Include="src\ColorHelper.hpp" />
     <ClInclude Include="src\Editor\LayerWrapper.h" />
     <ClInclude Include="src\Editor\util\EncodeUtil.hpp" />

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters

@@ -258,6 +258,9 @@
     <ClCompile Include="src\Editor\EditorWidgetComponent\FillStyleWidget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Editor\DataManager\ProjectDataManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="src\Renderer\RendererGLWidget.h">
@@ -522,6 +525,9 @@
     <ClInclude Include="src\ColorHelper.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\Editor\DataManager\ProjectDataManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="res\MainWindow.qrc">

ArchitectureColoredPainting/src/Editor/DataManager/ProjectDataManager.cpp

@@ -0,0 +1,38 @@
+#include "ProjectDataManager.h"
+
+using namespace std;
+
+ProjectDataManager* ProjectDataManager::instance = nullptr;
+
+ProjectDataManager* ProjectDataManager::Instance()
+{
+	if (instance == nullptr)
+		instance = new ProjectDataManager();
+	return instance;
+}
+
+void ProjectDataManager::addProjectData(ProjectData data)
+{
+	projectDataList.push_back(data);
+}
+
+void ProjectDataManager::setZoom(double x, double y, EditorWidgetItem* item)
+{
+	for (auto& data : projectDataList) {
+		if (data.item == item) {
+			data.zoomX = x;
+			data.zoomY = y;
+			return;
+		}
+	}
+}
+
+QPointF ProjectDataManager::getZoomByPainterDeivce(QPaintDevice* device)
+{
+	for (auto& data : projectDataList) {
+		if (data.item->previewWindow == device) {
+			return QPointF(data.zoomX, data.zoomY);
+		}
+	}
+	return QPointF(1, 1);
+}

ArchitectureColoredPainting/src/Editor/DataManager/ProjectDataManager.h

@@ -0,0 +1,30 @@
+#pragma once
+#include <map>
+#include <QPaintDevice>
+#include <QFile>
+#include <vector>
+#include "EditorWidgetItem.h"
+
+struct ProjectData
+{
+	int width, height;
+	double zoomX, zoomY;
+	QString fileHome;
+	EditorWidgetItem* item;
+};
+
+class ProjectDataManager
+{
+private:
+	std::vector<ProjectData> projectDataList;
+	ProjectDataManager() = default;
+	~ProjectDataManager() = default;
+	static ProjectDataManager* instance;
+	
+public:
+	static ProjectDataManager* Instance();
+	void addProjectData(ProjectData data);
+	void setZoom(double x, double y, EditorWidgetItem* item);
+	QPointF getZoomByPainterDeivce(QPaintDevice* device);
+};
+

ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp

@@ -1,6 +1,8 @@
 #include "EditorWidgetItem.h"
 #include "EditorWidget.h"
+#include "DataManager/ProjectDataManager.h"
 #include <QTimer>
+#include <QFileInfo>
 
 EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(parent)
 {
@@ -54,6 +56,14 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
     QJsonDocument jsonDoc(QJsonDocument::fromJson(setting, &jError));
     qDebug() << jsonDoc.object().value("height").toDouble();
     qDebug() << jError.errorString();
+    ProjectData data;
+    data.fileHome = QFileInfo(filePath).absolutePath();
+    data.width = jsonDoc.object().value("height").toInt();
+    data.height = jsonDoc.object().value("width").toInt();
+    data.zoomX = 1.0;
+    data.zoomY = 1.0;
+    data.item = this;
+    ProjectDataManager::Instance()->addProjectData(data);
     // end test
     QJsonObject source = jsonDoc.object();
     elementManager = new ElementManager(source,Renderer::ElementRenderer::instance());
@@ -79,7 +89,6 @@ EditorWidgetItem::EditorWidgetItem(QString filePath,QWidget *parent) : QWidget(p
 	        handleProjectNameChange(this->projectName);
             centralRefresh();
         });
-
 }
 
 EditorWidgetItem::~EditorWidgetItem()

ArchitectureColoredPainting/src/Editor/EditorWidgetItem.h

@@ -16,7 +16,7 @@ class EditorWidgetItem : public QWidget
 {
     Q_OBJECT
 
-  private:
+  public:
     // DATA PART
     PreviewWindow *previewWindow;
     ElementManager *elementManager;

ArchitectureColoredPainting/src/Editor/PreviewWindow.cpp

@@ -14,6 +14,7 @@ PreviewWindow::PreviewWindow(QWidget *parent) : QOpenGLWidget(parent)
     painter->setRenderHint(QPainter::HighQualityAntialiasing);
     layerManager = nullptr;
     currentLayer = nullptr;
+    zoomStep = 0;
 	backgroundColor = QColor(255, 255, 255, 255);
 }
 
@@ -21,6 +22,7 @@ void PreviewWindow::initialize(LayerManager *layerManager,QSize windowSize)
 {
 	this->logicalSize = windowSize;
     this->layerManager = layerManager;
+	this->setFixedSize(windowSize);
 }
 
 void PreviewWindow::show()
@@ -49,6 +51,7 @@ void PreviewWindow::paintGL()
 	glClearColor(backgroundColor.redF(), backgroundColor.greenF(), backgroundColor.blueF(), backgroundColor.alphaF());
     glClear(GL_COLOR_BUFFER_BIT);
     painter->begin(this);
+	painter->setWindow(0, 0, logicalSize.width(), logicalSize.height());
     painter->setRenderHint(QPainter::Antialiasing);
     painter->setRenderHint(QPainter::HighQualityAntialiasing);
     layerManager->paint(painter,this->size(),currentLayer);
@@ -129,4 +132,22 @@ void PreviewWindow::setBackgroundColor(QColor color)
 {
 	this->backgroundColor = color;
     this->repaint();
+}
+
+void PreviewWindow::wheelEvent(QWheelEvent* event)
+{
+    if (QApplication::keyboardModifiers() == Qt::ControlModifier)
+    {
+		if (event->delta() > 0 && zoomStep < ZOOM_STEP_MAX)
+		{
+			zoomStep++;
+			this->setFixedSize(logicalSize * (1 + zoomStep * ZOOM_RATE));
+		}
+        else if(event->delta() < 0 && zoomStep > ZOOM_STEP_MIN)
+		{
+			zoomStep--;
+            this->setFixedSize(logicalSize * (1 + zoomStep * ZOOM_RATE));
+		}
+		this->repaint();
+    }
 }

ArchitectureColoredPainting/src/Editor/PreviewWindow.h

@@ -16,6 +16,14 @@ class PreviewWindow : public QOpenGLWidget, protected QOpenGLFunctions
     Q_OBJECT
 
   private:
+	constexpr static double ZOOM_RATE = 0.25;
+	constexpr static double ZOOM_DEFAULT = 1.0;
+    constexpr static int ZOOM_STEP_MIN = -2;
+    constexpr static int ZOOM_STEP_MAX = 4;
+
+
+  private:
+    int zoomStep;
     QPainter *painter;
     LayerManager *layerManager;
 	Renderer::ElementRenderer* renderer;
@@ -27,6 +35,7 @@ class PreviewWindow : public QOpenGLWidget, protected QOpenGLFunctions
     void mousePressEvent(QMouseEvent* event) override;
 	void mouseMoveEvent(QMouseEvent* event) override;
 	void mouseReleaseEvent(QMouseEvent* event) override;
+    void wheelEvent(QWheelEvent* event) override;
     
   public:
     PreviewWindow(QWidget *parent = nullptr);