Commit Graph

355 Commits (f0ac3bf4f7503e9d464bec18a9759ced6f5323f4)

Author SHA1 Message Date
yang.yongquan 3c2eada43f 添加了获得线宽的函数 2023-03-18 20:26:07 +08:00
karlis 6494c2b9af Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-18 20:20:25 +08:00
wuyize fd1baf42f6 Renderer图元变换改用矩阵 2023-03-18 20:17:12 +08:00
karlis aeead9d22e 添加创建时递归约束 2023-03-18 20:12:43 +08:00
karlis 84bddf4447 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-18 16:26:51 +08:00
wuyize 31f2c1be8f 打开模型时卸载现有模型 2023-03-18 12:18:38 +08:00
ArgonarioD c15e8c3a5b [style] 重新设计了LayerStyle在Layer中的存储形式
新增了LayerStyleContainer类,修改了相关代码
修改了部分bad smells
2023-03-18 03:51:47 +08:00
karlis 24f8daf1fd 菜单优化 2023-03-17 17:14:09 +08:00
karlis 9e4cdb3a63 添加项目名称和背景颜色字段 2023-03-17 14:14:07 +08:00
wuyize 6a09bdd32c FIX: GraphicElement中pixelRatio计算错误 2023-03-17 12:29:31 +08:00
wuyize 2569b07233 Renderer部分Painting支持设置背景颜色 2023-03-17 11:54:43 +08:00
ArgonarioD 81bb1b4b86 [editor/style] 完成StrokeStyle的序列化和反序列化
[stroke] 取消创建StrokeStyle时的初值
2023-03-16 20:22:03 +08:00
wuyize 4ff5406acc FIX: qt-material-widgets资源未加载 2023-03-16 19:29:38 +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
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 073f68e360 初步实现了编辑器中的StrokeStyle
[style/stroke] 实现了行删除
[style/stroke] 基本稳定了strokeStyle的修改
[paint] 令drawElement时会应用style
[style] 修改了LayerStyle
[editor] 新增了ColorPicker类和StrokeStyleListView类
2023-03-15 11:43:16 +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
wuyize c6a4d79888 补充了StrokeEndType 2023-03-15 00:09:30 +08:00
wuyize 4ec58dbb8b FIX: 多样式不生效 2023-03-14 23:39:56 +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
karlis 97097fcc3a 修改旋转判定,添加style渲染接口 2023-03-14 15:36:19 +08:00
karlis f2ceca724a Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-14 15:14:28 +08:00
karlis eab8d7aeec Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-14 15:14:25 +08:00
karlis dc7a793d3a Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-14 15:03:03 +08:00
karlis 684c28dafd bug fix 2023-03-14 15:02:49 +08:00
karlis 72f0f78e64 bug fix 2023-03-14 14:53:36 +08:00
karlis 3f1421a1bd bug:黑屏 2023-03-14 00:20:31 +08:00
karlis 4c9fe168a9 bug: pixmap溢出 2023-03-13 23:36:31 +08:00
karlis de9d7143b6 添加【可能存在问题的】拖拽和旋转 2023-03-13 21:06:05 +08:00
karlis ed4c3c0064 实现【位置错误的】LayerBounding虚线框 2023-03-13 20:47:35 +08:00
wuyize 0d42af9200 实现彩绘纹理部分替换 2023-03-13 13:48:20 +08:00
ArgonarioD acd25b4964 temp fix: 编译不通过的问题
为PaintingUtil中的transformToPainting函数临时添加了返回值,需要在后续修改
2023-03-11 23:34:13 +08:00
karlis e3217aa134 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-11 22:58:31 +08:00