kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Arch: implement new get_param functions

Browse Source 
Additionally 2 Arch_Window bugs were fixed:
* If the W1 value was changed the box tracker was not repositioned relative to the cursor.
* The WindowColor was not applied because of a typo in the code. De current default color is quite dark BTW.

Note that all dimensional values that were not really defaults, but just the last entered values, have been removed from preferences-archdefaults.ui. As a result the layout looks a bit strange. That will be improved in a next PR.
This commit is contained in:
Roy-043
2024-01-09 14:03:55 +01:00
committed by Yorik van Havre
parent 4e53dcc7ac
commit be03a9cebf
34 changed files with 597 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/Arch/importDAE.py
View File

@@ -20,6 +20,8 @@
#***************************************************************************
import FreeCAD, Mesh, os, numpy, MeshPart, Arch, Draft
from draftutils import params
if FreeCAD.GuiUp:
from draftutils.translate import translate
else:
@@ -65,15 +67,14 @@ def triangulate(shape):
"triangulates the given face"
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch")
mesher = p.GetInt("ColladaMesher",0)
tessellation = p.GetFloat("ColladaTessellation",1.0)
grading = p.GetFloat("ColladaGrading",0.3)
segsperedge = p.GetInt("ColladaSegsPerEdge",1)
segsperradius = p.GetInt("ColladaSegsPerRadius",2)
secondorder = p.GetBool("ColladaSecondOrder",False)
optimize = p.GetBool("ColladaOptimize",True)
allowquads = p.GetBool("ColladaAllowQuads",False)
mesher = params.get_param_arch("ColladaMesher")
tessellation = params.get_param_arch("ColladaTessellation")
grading = params.get_param_arch("ColladaGrading")
segsperedge = params.get_param_arch("ColladaSegsPerEdge")
segsperradius = params.get_param_arch("ColladaSegsPerRadius")
secondorder = params.get_param_arch("ColladaSecondOrder")
optimize = params.get_param_arch("ColladaOptimize")
allowquads = params.get_param_arch("ColladaAllowQuads")
if mesher == 0:
return shape.tessellate(tessellation)
elif mesher == 1:
@@ -178,12 +179,9 @@ def export(exportList,filename,tessellation=1,colors=None):
curved surfaces into triangles."""
if not checkCollada(): return
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch")
scale = p.GetFloat("ColladaScalingFactor",1.0)
scale = params.get_param_arch("ColladaScalingFactor")
scale = scale * 0.001 # from millimeters (FreeCAD) to meters (Collada)
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View")
c = p.GetUnsigned("DefaultShapeColor",4294967295)
defaultcolor = (float((c>>24)&0xFF)/255.0,float((c>>16)&0xFF)/255.0,float((c>>8)&0xFF)/255.0)
defaultcolor = Draft.get_rgba_tuple(params.get_param_view("DefaultShapeColor"))[:3]
colmesh = collada.Collada()
colmesh.assetInfo.upaxis = collada.asset.UP_AXIS.Z_UP
# authoring info