Compare commits

...

4 Commits

Author SHA1 Message Date
ArgonarioD 55f37fd284 FIX:程序无法运行的问题 2023-02-07 16:14:56 +08:00
ArgonarioD 169aa9501c Merge branch 'main' into dev-sys 2023-02-07 16:05:33 +08:00
ArgonarioD 52e266cef0 为新的头文件添加了空实现 2023-02-07 16:05:24 +08:00
ArgonarioD 2d44fd4d9f 为新的QImage渲染方式修改了头文件
修改了GraphicElement、LayerWrapper
2023-02-07 15:57:59 +08:00
5 changed files with 92 additions and 15 deletions

View File

@ -38,3 +38,17 @@ QPainterPath GroupElement::getPaintObject() const
else else
return QPainterPath(); return QPainterPath();
} }
void BitmapPath::applyTransformation(QTransform& transformation)
{
}
QImage FolderBitmapPath::getStylesAppliedCache() const
{
return QImage();
}
QImage ComposedPainterPath::getStylesAppliedCache() const
{
return QImage();
}

View File

@ -3,38 +3,92 @@
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
#include <QPainterPath> #include <QPainterPath>
#include <QImage>
#include <string> #include <string>
#include "../Renderer/Painting/ElementStyle.h"
class LayerWrapper; class LayerWrapper;
class LeafLayerWrapper; class LeafLayerWrapper;
class FolderLayerWrapper; class FolderLayerWrapper;
class ComposedPainterPath;
class GraphicElement class GraphicElement
{ {
public: public:
QString name=""; QString name = "";
// TODO: 改为BitmapPath
virtual QPainterPath getPaintObject() const = 0; virtual QPainterPath getPaintObject() const = 0;
}; };
class SimpleElement : public GraphicElement class SimpleElement : public GraphicElement
{ {
private: private:
QJsonObject jsonSource; QJsonObject jsonSource;
// TODO: 改为ComposedPainterPath
QPainterPath painterPath; QPainterPath painterPath;
void loadSvgFile(const QString& filePath); void loadSvgFile(const QString& filePath);
public: public:
SimpleElement(QJsonObject jsonSource); SimpleElement(QJsonObject jsonSource);
~SimpleElement() = default; ~SimpleElement() = default;
QPainterPath getPaintObject() const override; QPainterPath getPaintObject() const override;
}; };
class GroupElement : public GraphicElement class GroupElement : public GraphicElement
{ {
public: public:
FolderLayerWrapper *sourceLayer; FolderLayerWrapper* sourceLayer;
public: public:
GroupElement() = default; GroupElement() = default;
GroupElement(FolderLayerWrapper *mSourceLayer); GroupElement(FolderLayerWrapper* mSourceLayer);
~GroupElement() = default; ~GroupElement() = default;
QPainterPath getPaintObject() const override; QPainterPath getPaintObject() const override;
void setSourceLayer(FolderLayerWrapper *sourceLayer); void setSourceLayer(FolderLayerWrapper* sourceLayer);
}; };
//******************************** BitmapPath ********************************//
using std::vector;
using std::shared_ptr;
class BitmapPath
{
protected:
QRectF boundingRect;
QImage stylesAppliedCache;
void applyTransformation(QTransform &transformation);
public:
/**
* painterQImage
*/
virtual void paint(QPainter* painter) const = 0;
virtual QImage getStylesAppliedCache() const = 0;
};
class FolderBitmapPath : public BitmapPath
{
public:
const vector<BitmapPath*> children;
virtual QImage getStylesAppliedCache() const override;
};
/**
* cacheRender
*/
class ComposedPainterPath : public BitmapPath
{
public:
/**
* ElementStylezealedStylePath
*/
struct SinglePath {
shared_ptr<QPainterPath> path;
bool zealed;
};
const vector<SinglePath> paths;
virtual QImage getStylesAppliedCache() const override;
};

View File

@ -12,6 +12,8 @@
#include <QTreeWidget> #include <QTreeWidget>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "../Renderer/Painting/ElementStyle.h"
using std::shared_ptr; using std::shared_ptr;
using std::vector; using std::vector;
class GraphicElement; class GraphicElement;
@ -25,7 +27,8 @@ class LayerWrapper
protected: protected:
shared_ptr<LayerWrapper> parent; shared_ptr<LayerWrapper> parent;
QPointF referencePoint; QPointF referencePoint;
vector<LayerStyle> styles; // vector<LayerStyle> styles;
// TODO: 将cache移到子类对Leaf用ComposedPainterPath对Folder用FolderBitmapPath
QPainterPath cache; QPainterPath cache;
public: public:
@ -38,10 +41,12 @@ class LayerWrapper
double rotation = 0; double rotation = 0;
bool flipHorizontally = 0; bool flipHorizontally = 0;
bool flipVertically = 0; bool flipVertically = 0;
// TODO: 将QPainterPath改为BitmapPath
void apply(QPainterPath &cache) const; void apply(QPainterPath &cache) const;
} property; } property;
void setParent(LayerWrapper *newParent); void setParent(LayerWrapper *newParent);
virtual void refresh(); virtual void refresh();
// TODO: 将QPainterPath改为BitmapPath/QImage或者直接将其删除绘制时直接使用BitmapPath的paint方法
QPainterPath getCache(); QPainterPath getCache();
LayerWrapper *getParent() const; // invoke by manager, then invoke parent's applyStyles LayerWrapper *getParent() const; // invoke by manager, then invoke parent's applyStyles
LayerWrapper(QJsonObject json, LayerWrapper *parent); LayerWrapper(QJsonObject json, LayerWrapper *parent);
@ -71,6 +76,7 @@ class LeafLayerWrapper : public LayerWrapper
{ {
public: public:
GraphicElement *wrappedElement; GraphicElement *wrappedElement;
const vector<Renderer::ElementStyle> styles;
public: public:
void refresh() override; void refresh() override;

View File

@ -43,11 +43,13 @@ std::vector<glm::vec2> generatePathBuffer(const QPainterPath& path)
break; break;
case QPainterPath::LineToElement: case QPainterPath::LineToElement:
qDebug() << "LineToElement"; qDebug() << "LineToElement";
glm::vec2 end = glm::vec2(element.x, element.y); {
glm::vec2 mid = (pathBuffer.back() + end) / 2.f; glm::vec2 end = glm::vec2(element.x, element.y);
pathBuffer.push_back(mid); glm::vec2 mid = (pathBuffer.back() + end) / 2.f;
pathBuffer.push_back(mid); pathBuffer.push_back(mid);
pathBuffer.push_back(end); pathBuffer.push_back(mid);
pathBuffer.push_back(end);
}
break; break;
case QPainterPath::CurveToElement: case QPainterPath::CurveToElement:
qDebug() << "CurveToElement"; qDebug() << "CurveToElement";

View File

@ -21,6 +21,7 @@ int main(int argc, char* argv[])
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
QApplication a(argc, argv); QApplication a(argc, argv);
FramelessHelper::Core::setApplicationOSThemeAware(); FramelessHelper::Core::setApplicationOSThemeAware();
FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur);
FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow); FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow); FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow);
MainWindow w; MainWindow w;