添加data.json
parent
4b97ece85d
commit
d6a3d3555d
|
@ -130,16 +130,16 @@
|
|||
<Filter>Source Files\Editor</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\Editor\ElementManager.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
<Filter>Source Files\Editor</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\Editor\LayerManager.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
<Filter>Source Files\Editor</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\Editor\LayerWrapper.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
<Filter>Source Files\Editor</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\Editor\PreviewWindow.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
<Filter>Source Files\Editor</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@ -168,7 +168,7 @@
|
|||
<Filter>Header Files</Filter>
|
||||
</QtMoc>
|
||||
<QtMoc Include="src\Editor\PreviewWindow.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<Filter>Header Files\Editor</Filter>
|
||||
</QtMoc>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@ -287,17 +287,17 @@
|
|||
<ClInclude Include="src\Editor\GraphicElement.h">
|
||||
<Filter>Header Files\Editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\Editor\ElementManager.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<ClInclude Include="src\Editor\LayerStyle.h">
|
||||
<Filter>Header Files\Editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\Editor\LayerManager.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<Filter>Header Files\Editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\Editor\LayerStyle.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<ClInclude Include="src\Editor\ElementManager.h">
|
||||
<Filter>Header Files\Editor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\Editor\LayerWrapper.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<Filter>Header Files\Editor</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
#include "LayerManager.h"
|
||||
|
||||
void LayerManager::paint(QPainter *painter) const
|
||||
LayerManager::LayerManager(QObject *parent)
|
||||
{
|
||||
scene = new QGraphicsScene(parent);
|
||||
}
|
||||
void LayerManager::paint(QGraphicsView *view) const
|
||||
{
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
#include "LayerWrapper.h"
|
||||
#include <QPainter>
|
||||
#include <QGraphicsView>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
using std::pair;
|
||||
|
@ -9,10 +9,12 @@ class LayerManager
|
|||
{
|
||||
private:
|
||||
using LayerPtrs = vector<LayerWrapper *>;
|
||||
LayerWrapper root;
|
||||
LayerWrapper *root;
|
||||
LayerPtrs selectedLayers;
|
||||
LayerPtrs involvedLeafLayersCache;
|
||||
QGraphicsScene *scene;
|
||||
|
||||
public:
|
||||
void paint(QPainter *painter) const;
|
||||
LayerManager(QObject *parent = 0);
|
||||
void paint(QGraphicsView *view) const;
|
||||
};
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
#include "LayerWrapper.h"
|
||||
|
||||
void LayerWrapper::applyStyles(SimpleElement &element)
|
||||
{
|
||||
}
|
||||
void FolderLayerWrapper::addChild(LayerWrapper *child)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
#pragma once
|
||||
#include "GraphicElement.h"
|
||||
#include "LayerStyle.h"
|
||||
#include <QGraphicsItem>
|
||||
#include <QGraphicsItemGroup>
|
||||
#include <QGraphicsScene>
|
||||
#include <QLine>
|
||||
#include <QPoint>
|
||||
#include <memory>
|
||||
|
@ -16,7 +19,7 @@ class LayerWrapper
|
|||
QPainterPath cache;
|
||||
|
||||
public:
|
||||
void applyStyles(SimpleElement &element); // invoke by manager, then invoke parent's applyStyles
|
||||
virtual void draw(QGraphicsScene *scene) = 0; // invoke by manager, then invoke parent's applyStyles
|
||||
// todo: provide atomic operations for Events
|
||||
};
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ void PreviewWindow::show()
|
|||
{
|
||||
mainScene->clear();
|
||||
QFile settingFile;
|
||||
settingFile.setFileName("C:/Users/Karlis/Desktop/data.json");
|
||||
settingFile.setFileName("../data.json");
|
||||
settingFile.open(QFile::ReadOnly);
|
||||
QByteArray setting = settingFile.readAll().trimmed();
|
||||
QJsonDocument jsonDoc(QJsonDocument::fromJson(setting));
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#pragma once
|
||||
#include "GraphicElement.h"
|
||||
#include "LayerManager.h"
|
||||
#include "QGraphicsItem.h"
|
||||
#include "QGraphicsView.h"
|
||||
#include <QFile>
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"elements":[
|
||||
{
|
||||
"type":"polygon",
|
||||
"data":{
|
||||
"points":[{"x":20,"y":30},{"x":20,"y":50},{"x":50,"y":100},{"x":20,"y":30}]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type":"polygon",
|
||||
"data":{
|
||||
"points":[{"x":100,"y":100},{"x":100,"y":500},{"x":500,"y":500},{"x":100,"y":100}]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type":"round",
|
||||
"data":{
|
||||
"x-axis":500,
|
||||
"y-axis":500,
|
||||
"angle":360
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
}
|
Loading…
Reference in New Issue