suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0000970: IDF import skips first hole

Browse Source
This commit is contained in:
corey625 2014-05-20 17:27:35 +02:00 committed by wmayer
parent 17b7003ea7
commit c6d9c3789a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Idf/Idf.py
View File

@ -110,7 +110,7 @@ def process_emn(doc,filename):
FreeCAD.Console.PrintMessage("Found board thickness "+emnrecords[0]+"\n") FreeCAD.Console.PrintMessage("Found board thickness "+emnrecords[0]+"\n")
if current_section==".BOARD_OUTLINE" and section_counter>2: if current_section==".BOARD_OUTLINE" and section_counter>2:
board_outline.append([int(emnrecords[0]),float(emnrecords[1])*emn_unit,float(emnrecords[2])*emn_unit,float(emnrecords[3])]) board_outline.append([int(emnrecords[0]),float(emnrecords[1])*emn_unit,float(emnrecords[2])*emn_unit,float(emnrecords[3])])
if current_section==".DRILLED_HOLES" and section_counter>2 and float(emnrecords[0])*emn_unit>ignore_hole_size: if current_section==".DRILLED_HOLES" and section_counter>1 and float(emnrecords[0])*emn_unit>ignore_hole_size:
drills.append([float(emnrecords[0])*emn_unit,float(emnrecords[1])*emn_unit,float(emnrecords[2])*emn_unit]) drills.append([float(emnrecords[0])*emn_unit,float(emnrecords[1])*emn_unit,float(emnrecords[2])*emn_unit])
if current_section==".PLACEMENT" and section_counter>1 and fmod(section_counter,2)==0: if current_section==".PLACEMENT" and section_counter>1 and fmod(section_counter,2)==0:
place_item=[] place_item=[]
@ -125,7 +125,7 @@ def process_emn(doc,filename):
place_item.append(emnrecords[emn_version+2]) #Place Status place_item.append(emnrecords[emn_version+2]) #Place Status
FreeCAD.Console.PrintMessage(str(place_item)+"\n") FreeCAD.Console.PrintMessage(str(place_item)+"\n")
placement.append(place_item) placement.append(place_item)
FreeCAD.Console.PrintMessage("\n".join(passed_sections)) FreeCAD.Console.PrintMessage("\n".join(passed_sections)+"\n")
FreeCAD.Console.PrintMessage("Proceed "+str(Process_board_outline(doc,board_outline,drills,board_thickness))+" outlines\n") FreeCAD.Console.PrintMessage("Proceed "+str(Process_board_outline(doc,board_outline,drills,board_thickness))+" outlines\n")
placement.sort(key=lambda param: (param[IDF_sort],param[0])) placement.sort(key=lambda param: (param[IDF_sort],param[0]))
process_emp(doc,filename,placement,board_thickness) process_emp(doc,filename,placement,board_thickness)
@ -244,8 +244,8 @@ def process_emp(doc,filename,placement,board_thickness):
emprecords=split_records(empline) emprecords=split_records(empline)
if len( emprecords )==0 : continue if len( emprecords )==0 : continue
if len( emprecords[0] )>4 and emprecords[0][0:4]==".END": if len( emprecords[0] )>4 and emprecords[0][0:4]==".END":
current_section=""
passed_sections.append(current_section) passed_sections.append(current_section)
current_section=""
if comp_PartNumber!="": if comp_PartNumber!="":
if comp_height==0: if comp_height==0:
comp_height=0.1 comp_height=0.1
@ -270,7 +270,7 @@ def process_emp(doc,filename,placement,board_thickness):
comp_height=emp_unit*float(emprecords[3]) # Comp Height comp_height=emp_unit*float(emprecords[3]) # Comp Height
if (current_section==".ELECTRICAL" or current_section==".MECHANICAL") and section_counter>2: if (current_section==".ELECTRICAL" or current_section==".MECHANICAL") and section_counter>2:
comp_outline.append([float(emprecords[1])*emp_unit,float(emprecords[2])*emp_unit,float(emprecords[3])]) #add point of outline comp_outline.append([float(emprecords[1])*emp_unit,float(emprecords[2])*emp_unit,float(emprecords[3])]) #add point of outline
FreeCAD.Console.PrintMessage("\n".join(passed_sections)) FreeCAD.Console.PrintMessage("\n".join(passed_sections)+"\n")
#Write file with list of footprint #Write file with list of footprint
if IDF_diag==1: if IDF_diag==1:
empfile=pythonopen(IDF_diag_path+"/footprint.lst", "w") empfile=pythonopen(IDF_diag_path+"/footprint.lst", "w")