 ArgonarioD
|
1e3bef78f4
|
[style/stroke] 完成宽度设置
|
2023-03-15 14:23:52 +08:00 |
|
ArgonarioD
|
27c1d4d18a
|
将StrokeStyleWidget的表格改为了其中的一个类
|
2023-03-15 13:44:08 +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 |
|
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
|
744ae58743
|
测试LayerStyle inputWidget的数据绑定
|
2023-03-12 15:39:19 +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 |
|
karlis
|
2cb25b8607
|
添加Layer的组合元素创建
|
2023-03-11 22:57:23 +08:00 |
|
yang.yongquan
|
631f0f8af7
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-11 19:52:39 +08:00 |
|
yang.yongquan
|
50acb3b625
|
转换为Painting类，（z轴、线宽、测试）
|
2023-03-11 19:52:36 +08:00 |
|
karlis
|
c92a3553ce
|
修改getReferencedBy为动态
|
2023-03-11 18:33:56 +08:00 |
|
wuyize
|
4bfdb0d9f6
|
Fix: 模型包围盒计算错误
|
2023-03-10 23:24:19 +08:00 |
|
karlis
|
ca8d68fe93
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-10 19:44:34 +08:00 |
|
karlis
|
3dd7fd7c0f
|
bug fix
|
2023-03-10 19:44:18 +08:00 |
|
wuyize
|
6508f54333
|
MaterialStyle加入深拷贝方法clone
|
2023-03-10 19:41:06 +08:00 |
|
ArgonarioD
|
b981056674
|
将LayerStyleDialog改为了修改拷贝对象
MaterialStyle的拷贝有问题，导致编译报错
|
2023-03-10 17:00:52 +08:00 |
|
ArgonarioD
|
293c1f3096
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-10 16:07:54 +08:00 |
|
ArgonarioD
|
65e03ed3ba
|
修改了MaterialStyle的属性访问权限
|
2023-03-10 16:07:21 +08:00 |
|
ArgonarioD
|
94b16ac536
|
修改了LayerStyle的materialStyles的类型，添加了深拷贝构造函数
|
2023-03-10 16:07:07 +08:00 |
|
ArgonarioD
|
7c7cd02d71
|
移动了LayerStyleDialog所在的文件夹
|
2023-03-10 16:06:33 +08:00 |
|
wuyize
|
520597e288
|
添加MaterialStyleStroke的拷贝构造
|
2023-03-10 16:04:29 +08:00 |
|
ArgonarioD
|
15e2522591
|
让图层功能暂时能用了
|
2023-03-10 14:08:40 +08:00 |
|
ArgonarioD
|
14a1502a22
|
Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting
|
2023-03-10 13:58:11 +08:00 |
|
ArgonarioD
|
846f334d54
|
完成style的基本构架
|
2023-03-10 13:57:57 +08:00 |