ArgonarioD
|
9984dd23f8
|
Merge branch 'main' into dev-LayerStyle
|
2023-03-16 20:17:12 +08:00 |
ArgonarioD
|
200dccff46
|
[stroke] 完成序列化和反序列化
|
2023-03-16 20:16:03 +08:00 |
ArgonarioD
|
fef34280c6
|
[editor/util] fix: toBase64 size设置有误导致编码错误
|
2023-03-16 20:15:13 +08:00 |
wuyize
|
4ff5406acc
|
FIX: qt-material-widgets资源未加载
|
2023-03-16 19:29:38 +08:00 |
ArgonarioD
|
50a1bdaff4
|
merge
|
2023-03-16 15:47:59 +08:00 |
ArgonarioD
|
ce7f2ae8fa
|
同上
|
2023-03-16 15:34:21 +08:00 |
ArgonarioD
|
6ce962b4c5
|
[style] 将MaterialStyle的存储方式改为了Base64编码
|
2023-03-16 15:34:21 +08:00 |
karlis
|
6d554ab265
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-16 14:51:43 +08:00 |
karlis
|
a9fb9197e6
|
删除冗余计算,重写预览逻辑,修复BoundRect,添加预览刷新触发
|
2023-03-16 14:51:28 +08:00 |
wuyize
|
15a41d61a5
|
实现MaterialStyle的decoded方法
|
2023-03-16 14:48:28 +08:00 |
ArgonarioD
|
03a06ce426
|
[editor/style] 进一步完善StrokeStyle相关
[stroke] 初步完成StrokeStyle序列化
[editor/util] 新增JsonUtil
[stroke] 完成添加单层描边功能
[stroke] 完成设置控件
[stroke] 将StrokeStyleListView修改为了StrokeStyleWidget
|
2023-03-16 02:13:25 +08:00 |
ArgonarioD
|
f109ed7d62
|
merge
|
2023-03-16 02:05:29 +08:00 |
ArgonarioD
|
257868fd4c
|
[style] 初步完成LayerStyle序列化
|
2023-03-16 01:56:05 +08:00 |
ArgonarioD
|
8809daaddd
|
[stroke] fix: 新增描边时无法正确应用颜色修改的问题
|
2023-03-16 01:54:50 +08:00 |
ArgonarioD
|
e72ba7ebbd
|
[editor/util] 添加了JsonUtil
|
2023-03-16 01:53:28 +08:00 |
wuyize
|
78c24ad373
|
FIX: painting渲染bug
|
2023-03-15 22:43:51 +08:00 |
karlis
|
627b947738
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-15 21:10:19 +08:00 |
karlis
|
8903419799
|
修复了zt黄色的问题
|
2023-03-15 21:10:05 +08:00 |
karlis
|
70d5973a90
|
修复了yyq黄色的问题
|
2023-03-15 21:04:21 +08:00 |
karlis
|
6c86403c4a
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-15 20:22:26 +08:00 |
karlis
|
b9c8624dae
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-15 20:22:17 +08:00 |
karlis
|
153f6bdd8e
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-15 20:10:18 +08:00 |
karlis
|
c234c0e9b3
|
实现element导入,添加滚动条,修复空白打开
|
2023-03-15 20:10:14 +08:00 |
wuyize
|
3abc0d9bcd
|
初步完成json到Painting的转换
|
2023-03-15 19:24:33 +08:00 |
yang.yongquan
|
5d88ddf0ca
|
增加图片刷新的槽函数
|
2023-03-15 17:37:12 +08:00 |
karlis
|
fa91d80b70
|
完善Element序列化
|
2023-03-15 16:36:46 +08:00 |
karlis
|
3b87644e21
|
修改了PixelPath
|
2023-03-15 16:16:59 +08:00 |
ArgonarioD
|
3ceeba61b5
|
[stroke] 基本完成添加单层描边功能
|
2023-03-15 15:39:51 +08:00 |
ArgonarioD
|
7079b335cb
|
[style/stroke] 完成所有设置控件
|
2023-03-15 15:09:55 +08:00 |
ArgonarioD
|
1e3bef78f4
|
[style/stroke] 完成宽度设置
|
2023-03-15 14:23:52 +08:00 |
ArgonarioD
|
27c1d4d18a
|
将StrokeStyleWidget的表格改为了其中的一个类
|
2023-03-15 13:44:08 +08:00 |
ArgonarioD
|
073f68e360
|
初步实现了编辑器中的StrokeStyle
[style/stroke] 实现了行删除
[style/stroke] 基本稳定了strokeStyle的修改
[paint] 令drawElement时会应用style
[style] 修改了LayerStyle
[editor] 新增了ColorPicker类和StrokeStyleListView类
|
2023-03-15 11:43:16 +08:00 |
ArgonarioD
|
460428c135
|
Merge branch 'main' into dev-LayerStyle
|
2023-03-15 11:36:32 +08:00 |
yang.yongquan
|
73e63f3817
|
merge
|
2023-03-15 11:25:14 +08:00 |
yang.yongquan
|
d47d94d044
|
增加了对于Painting的转换,没有考虑线宽的情况
|
2023-03-15 11:23:26 +08:00 |
wuyize
|
57d6de47f8
|
Fix: painting.comp bug
|
2023-03-15 11:23:21 +08:00 |
ArgonarioD
|
6494758781
|
Merge branch 'main' into dev-LayerStyle
|
2023-03-15 11:22:31 +08:00 |
ArgonarioD
|
7da434541a
|
[stroke] 实现了行删除
|
2023-03-15 11:21:23 +08:00 |
wuyize
|
c6a4d79888
|
补充了StrokeEndType
|
2023-03-15 00:09:30 +08:00 |
ArgonarioD
|
6a742f6526
|
Merge branch 'main' into dev-LayerStyle
|
2023-03-14 23:41:49 +08:00 |
wuyize
|
4ec58dbb8b
|
FIX: 多样式不生效
|
2023-03-14 23:39:56 +08:00 |
ArgonarioD
|
6191eb919e
|
Merge branch 'main' into dev-LayerStyle
|
2023-03-14 22:49:29 +08:00 |
ArgonarioD
|
0ff779c5b2
|
基本稳定了strokeStyle的修改
|
2023-03-14 22:46:54 +08:00 |
wuyize
|
cf3dd43a4a
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-14 22:44:43 +08:00 |
wuyize
|
62b9c2b026
|
FIX: style的bug
|
2023-03-14 22:44:23 +08:00 |
ArgonarioD
|
e97e6d5281
|
令drawElement时会应用style
|
2023-03-14 18:19:41 +08:00 |
ArgonarioD
|
b429761d81
|
merged
|
2023-03-14 18:12:31 +08:00 |
ArgonarioD
|
1b926b2054
|
修改了LayerStyle
将clonePtr重命名为了clone
将StrokeElementLayerStyle的存储style方式改为了通过pair存储两侧
|
2023-03-14 17:59:46 +08:00 |
ArgonarioD
|
28df3d47c5
|
新增了ColorPicker类和StrokeStyleListView类
|
2023-03-14 17:57:58 +08:00 |
karlis
|
97097fcc3a
|
修改旋转判定,添加style渲染接口
|
2023-03-14 15:36:19 +08:00 |