BigC
/
ArchitectureColoredPainting
4
2
Fork 0
Code Issues 6 Pull Requests Projects Releases 5 Wiki Activity

Compare commits

base: BigC:9057500da8a179fde2f0644886fd8c0aa1e12b6a
Branches Tags
BigC:main
BigC:dev-wuyize
BigC:dev-yyq
BigC:dev-LayerStyle
BigC:TaoZhang-Branch
BigC:dev-VirtualTexture
BigC:v0.2.0
BigC:v0.1.3
BigC:v0.1.2
BigC:v0.1.1
BigC:v0.1.0
...
compare: BigC:291d112d113f0b8dbb4f1a8c48c6640a2c7e6439
Branches Tags
BigC:main
BigC:dev-wuyize
BigC:dev-yyq
BigC:dev-LayerStyle
BigC:TaoZhang-Branch
BigC:dev-VirtualTexture
BigC:v0.2.0
BigC:v0.1.3
BigC:v0.1.2
BigC:v0.1.1
BigC:v0.1.0

2 Commits
9057500da8 ... 291d112d11

Author SHA1 Message Date
karlis 291d112d11 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-21 14:35:40 +08:00
karlis fff1ce3424 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-21 14:35:37 +08:00
2 changed files with 3 additions and 1 deletions
Show Stats Expand all files Collapse all files

3
ArchitectureColoredPainting/src/Editor/GraphicElement.cpp
View File

@ -114,7 +114,7 @@ void SimpleElement::paint(QPainter* painter, QTransform transform, const LayerSt
else else
maxScale = std::max(fabs(transform.m12() / sin(angle)), fabs(transform.m21() / sin(angle))); maxScale = std::max(fabs(transform.m12() / sin(angle)), fabs(transform.m21() / sin(angle)));
double pixelRatio = maxScale * QGuiApplication::primaryScreen()->devicePixelRatio(); double pixelRatio = maxScale * QGuiApplication::primaryScreen()->devicePixelRatio();
if (painterPath == painterPathPrev && styles.getHash() == stylesHashValue) if (painterPath == painterPathPrev && styles.getHash() == stylesHashValue && pixelRatio == pixelRatioPrev)
{ {
transform.translate(movPrev.x(), movPrev.y()); transform.translate(movPrev.x(), movPrev.y());
painter->setTransform(transform.scale(1 / pixelRatio, 1 / pixelRatio)); painter->setTransform(transform.scale(1 / pixelRatio, 1 / pixelRatio));
@ -130,6 +130,7 @@ void SimpleElement::paint(QPainter* painter, QTransform transform, const LayerSt
painterPathPrev = painterPath; painterPathPrev = painterPath;
imagePrev = img; imagePrev = img;
movPrev = mov; movPrev = mov;
pixelRatioPrev = pixelRatio;
} }
} }

1
ArchitectureColoredPainting/src/Editor/GraphicElement.h
View File

@ -27,6 +27,7 @@ public:
QPainterPath painterPathPrev; QPainterPath painterPathPrev;
QPointF movPrev; QPointF movPrev;
QImage imagePrev; QImage imagePrev;
double pixelRatioPrev;
int index; int index;
// TODO: 改为BitmapPath // TODO: 改为BitmapPath
virtual QJsonObject toJson() const = 0; virtual QJsonObject toJson() const = 0;