diff --git a/CHANGELOG.md b/CHANGELOG.md index 43b92fd8..de0d1004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ CHANGELOG for FlatCAM beta - working in Milling Tool - updated the Calculators Tool such that now the Cut Z parameter for V-tip tool calculator can be calculated from the other parameters too - fixed a small issue in the Calculators Tool Cut Z default value; added a confirmation message for Electroplating calculator +- fixed bug in opening PDF file from recent files list 14.11.2020 diff --git a/appTools/ToolPDF.py b/appTools/ToolPDF.py index ae613183..7be1e293 100644 --- a/appTools/ToolPDF.py +++ b/appTools/ToolPDF.py @@ -198,7 +198,8 @@ class ToolPDF(AppTool): self.pdf_parsed[short_name]['pdf'] = self.parser.parse_pdf(pdf_content=self.pdf_decompressed[short_name]) # we used it, now we delete it - self.pdf_decompressed[short_name] = '' + if self.pdf_decompressed[short_name]: + self.pdf_decompressed[short_name] = None # removal from list is done in a multithreaded way therefore not always the removal can be done # try to remove until it's done @@ -276,7 +277,7 @@ class ToolPDF(AppTool): self.app.inform.emit('[ERROR_NOTCL] %s' % _('Open PDF file failed.')) return # Register recent file - self.app.file_opened.emit("excellon", filename) + self.app.file_opened.emit("pdf", filename) # GUI feedback self.app.inform.emit('[success] %s: %s' % (_("Rendered"), outname)) @@ -349,7 +350,7 @@ class ToolPDF(AppTool): self.app.inform.emit('[ERROR_NOTCL] %s' % _('Open PDF file failed.')) return # Register recent file - self.app.file_opened.emit('gerber', filename) + self.app.file_opened.emit('pdf', filename) # GUI feedback self.app.inform.emit('[success] %s: %s' % (_("Rendered"), outname)) diff --git a/app_Main.py b/app_Main.py index 11d23efa..a9818c0e 100644 --- a/app_Main.py +++ b/app_Main.py @@ -7415,17 +7415,17 @@ class App(QtCore.QObject): :return: """ icons = { - "gerber": self.resource_location + "/flatcam_icon16.png", + "gerber": self.resource_location + "/flatcam_icon16.png", "excellon": self.resource_location + "/drill16.png", 'geometry': self.resource_location + "/geometry16.png", - "cncjob": self.resource_location + "/cnc16.png", - "script": self.resource_location + "/script_new24.png", + "cncjob": self.resource_location + "/cnc16.png", + "script": self.resource_location + "/script_new24.png", "document": self.resource_location + "/notes16_1.png", - "project": self.resource_location + "/project16.png", - "svg": self.resource_location + "/geometry16.png", - "dxf": self.resource_location + "/dxf16.png", - "pdf": self.resource_location + "/pdf32.png", - "image": self.resource_location + "/image16.png" + "project": self.resource_location + "/project16.png", + "svg": self.resource_location + "/geometry16.png", + "dxf": self.resource_location + "/dxf16.png", + "pdf": self.resource_location + "/pdf32.png", + "image": self.resource_location + "/image16.png" } @@ -7445,7 +7445,7 @@ class App(QtCore.QObject): 'svg': self.f_handlers.import_svg, 'dxf': self.f_handlers.import_dxf, 'image': image_opener, - 'pdf': lambda fname: self.worker_task.emit({'fcn': self.pdf_tool.open_pdf, 'params': [fname]}) + 'pdf': self.f_handlers.import_pdf } # Open recent file for files @@ -10210,6 +10210,10 @@ class MenuFileHandlers(QtCore.QObject): # Register recent file self.app.file_opened.emit("dxf", filename) + def import_pdf(self, filename): + self.app.pdf_tool.periodic_check(1000) + self.worker_task.emit({'fcn': self.app.pdf_tool.open_pdf, 'params': [filename]}) + def open_gerber(self, filename, outname=None, plot=True, from_tcl=False): """ Opens a Gerber file, parses it and creates a new object for