lefake/S4-P3-Projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#55-UI frame

Browse Source 
Refactor main the ease usage in the UI
This commit is contained in:
Marc-Antoine Lafreniere
2019-03-20 13:48:58 -04:00
parent df46cbc405
commit 7469e58cdf
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
pcbdevice/main.py
View File

@@ -8,6 +8,31 @@ from pcbdevice.utils.FileUtils import FileUtils
import argparse import argparse
import subprocess import subprocess
def main(inputPath, outputPath, converterPath, isAscii, heightReal, widthReal, tool, unit):
if outputPath.rfind('\\') != -1:
asciiPbmPath = outputPath[0:outputPath.rfind('\\')] + '\\pcbImageAscii.pbm'
elif outputPath.rfind('/') != -1:
asciiPbmPath = outputPath[0:outputPath.rfind('/')] + '/pcbImageAscii.pbm'
else:
asciiPbmPath = '.\\pcbdevice\\resources\\output\\pcbImageAscii.pbm'
if not isAscii:
subprocess.check_call([converterPath, inputPath, asciiPbmPath])
matrix, height, width = FileUtils.pbmToMatrix(asciiPbmPath)
pxHeight, pxWidth = FileUtils.getPixelSize(height, width, heightReal, widthReal, unit = unit)
if pxHeight > pxWidth:
rTool = int(math.ceil(tool * pxHeight))
else:
rTool = int(math.ceil(tool * pxWidth))
matrixUpdated = path(matrix, rTool)
listIndexes = createSequence(matrixUpdated)
gcode = listToGCode(listIndexes, pxHeight, pxWidth)
FileUtils.saveStringListToFile(gcode, outputPath)
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(prog = 'main.py') parser = argparse.ArgumentParser(prog = 'main.py')
parser.add_argument('-i', required = True, help = 'PCB image path') parser.add_argument('-i', required = True, help = 'PCB image path')
@@ -19,31 +44,15 @@ if __name__ == "__main__":
parser.add_argument('-u', required = False, help = 'PCB dimension unit') parser.add_argument('-u', required = False, help = 'PCB dimension unit')
args = parser.parse_args() args = parser.parse_args()
converterPath = '.\\pcbdevice\\utils\\convertiseur.exe' converter = '.\\pcbdevice\\utils\\convertiseur.exe'
asciiPbmPath = '.\\pcbdevice\\resources\\output\\pcbImageAscii.pbm'
unitValue = 'mm' unitValue = 'mm'
isAscii = args.imgTypeisAscii isAscii = args.imgTypeisAscii
if isAscii:
asciiPbmPath = args.i
if not isAscii:
subprocess.check_call([converterPath, args.i, asciiPbmPath])
matrix, height, width = FileUtils.pbmToMatrix(asciiPbmPath)
if args.u: if args.u:
unitValue = args.u unitValue = args.u
pxHeight, pxWidth = FileUtils.getPixelSize(height, width, args.he, args.wi, unit = unitValue) if isAscii:
asciiPbmPath = args.i
if pxHeight > pxWidth: main(args.i, args.o, converter, isAscii, args.wi, args.he, args.t, unitValue)
rTool = int(math.ceil(args.t * pxHeight))
else:
rTool = int(math.ceil(args.t * pxWidth))
matrixUpdated = path(matrix, rTool)
listIndexes = createSequence(matrixUpdated)
gcode = listToGCode(listIndexes, pxHeight, pxWidth)
FileUtils.saveStringListToFile(gcode, args.o)