mirror
/
blendercam
kopia lustrzana https://github.com/vilemduha/blendercam
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'master' of https://github.com/vilemnovak/blendercam into NCupdate

pull/25/head
Jeff Doyle (nfz) 2016-01-31 19:31:13 -04:00
rodzic 5c9fa42b22 51f1d2ebe3
commit f14bd23c55
3 zmienionych plików z 10 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
scripts/addons/basrelief.py
Wyświetl plik

@ -845,7 +845,7 @@ class BasReliefsettings(bpy.types.PropertyGroup):
attenuation = FloatProperty(name="Gradient attenuation", description="Gradient attenuation", min=0.000001, max=100.0, default=1.0, precision=PRECISION)
min_gridsize = bpy.props.IntProperty(name="Minimum grid size", default=16, min=2, max=512)
smooth_iterations=bpy.props.IntProperty(name="Smooth iterations", default=1, min=1, max=64)
vcycle_iterations=bpy.props.IntProperty(name="V-cycle iterations",description="set up higher for plananr constraint", default=2, min=1, max=64)
vcycle_iterations=bpy.props.IntProperty(name="V-cycle iterations",description="set up higher for plananr constraint", default=2, min=1, max=128)
linbcg_iterations = bpy.props.IntProperty(name="Linbcg iterations",description="set lower for flatter relief, and when using planar constraint", default=5, min=1, max=64)
use_planar=bpy.props.BoolProperty(name="Use planar constraint",description="", default=False)
gradient_scaling_mask_use=bpy.props.BoolProperty(name="Scale gradients with mask",description="", default=False)

6
scripts/addons/cam/ops.py
Wyświetl plik

@ -138,8 +138,12 @@ class PathsBackground(bpy.types.Operator):
bpath=bpy.app.binary_path
fpath=bpy.data.filepath
scriptpath=bpy.utils.script_paths()[0]+os.sep+'addons'+os.sep+'cam'+os.sep+'backgroundop.py_'
for p in bpy.utils.script_paths():
scriptpath=p+os.sep+'addons'+os.sep+'cam'+os.sep+'backgroundop.py_'
print(scriptpath)
if os.path.isfile(scriptpath):
break;
proc= subprocess.Popen([bpath, '-b', fpath,'-P',scriptpath,'--', '-o='+str(s.cam_active_operation) ],bufsize=1, stdout=subprocess.PIPE,stdin=subprocess.PIPE)
tcom=threadCom(o,proc)

5
scripts/addons/cam/utils.py
Wyświetl plik

@ -1078,7 +1078,7 @@ def exportGcodePath(filename,vertslist,operations):
elif m.post_processor=='HEIDENHAIN':
extension='.H'
from .nc import heiden as postprocessor
elif m.post_processor=='TNC11':
elif m.post_processor=='TNC151':
from .nc import tnc151 as postprocessor
elif m.post_processor=='SIEGKX1':
from .nc import siegkx1 as postprocessor
@ -2883,6 +2883,9 @@ def getPath3axis(context, operation):
if o.cutter_type=='VCARVE':
angle = o.cutter_tip_angle
maxdepth = - math.tan(math.pi*(90-angle/2)/180) * o.cutter_diameter/2
elif o.cutter_type=='BALLNOSE' or o.cutter_type=='BALL':
#angle = o.cutter_tip_angle
maxdepth = o.cutter_diameter/2
#remember resolutions of curves, to refine them,
#otherwise medial axis computation yields too many branches in curved parts
resolutions_before=[]