giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- some changes in Excellon Editor

This commit is contained in:
Marius Stanciu 2020-01-28 17:34:21 +02:00
parent fd0438842d
commit 85afb7cdb2
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
FlatCAMApp.py
View File

@ -3448,8 +3448,6 @@ class App(QtCore.QObject):
# restore GUI to the Selected TAB # restore GUI to the Selected TAB
# Remove anything else in the GUI # Remove anything else in the GUI
self.ui.tool_scroll_area.takeWidget() self.ui.tool_scroll_area.takeWidget()
# Switch notebook to Selected page
self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
elif isinstance(edited_obj, FlatCAMGerber): elif isinstance(edited_obj, FlatCAMGerber):
obj_type = "Gerber" obj_type = "Gerber"
@ -3473,14 +3471,12 @@ class App(QtCore.QObject):
# restore GUI to the Selected TAB # restore GUI to the Selected TAB
# Remove anything else in the GUI # Remove anything else in the GUI
self.ui.selected_scroll_area.takeWidget() self.ui.selected_scroll_area.takeWidget()
# Switch notebook to Selected page
self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
elif isinstance(edited_obj, FlatCAMExcellon): elif isinstance(edited_obj, FlatCAMExcellon):
obj_type = "Excellon" obj_type = "Excellon"
if cleanup is None: if cleanup is None:
self.exc_editor.update_fcexcellon(edited_obj) self.exc_editor.update_fcexcellon(edited_obj)
self.exc_editor.update_options(edited_obj) # self.exc_editor.update_options(edited_obj)
self.exc_editor.deactivate() self.exc_editor.deactivate()
@ -3493,8 +3489,6 @@ class App(QtCore.QObject):
# restore GUI to the Selected TAB # restore GUI to the Selected TAB
# Remove anything else in the GUI # Remove anything else in the GUI
self.ui.tool_scroll_area.takeWidget() self.ui.tool_scroll_area.takeWidget()
# Switch notebook to Selected page
self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
else: else:
self.inform.emit('[WARNING_NOTCL] %s' % self.inform.emit('[WARNING_NOTCL] %s' %
@ -3519,11 +3513,13 @@ class App(QtCore.QObject):
self.inform.emit('[WARNING_NOTCL] %s' % self.inform.emit('[WARNING_NOTCL] %s' %
_("Select a Gerber, Geometry or Excellon Object to update.")) _("Select a Gerber, Geometry or Excellon Object to update."))
return return
edited_obj.set_ui(edited_obj.ui_type(decimals=self.decimals))
edited_obj.build_ui()
self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
elif response == bt_cancel: elif response == bt_cancel:
return return
edited_obj.set_ui(edited_obj.ui_type(decimals=self.decimals))
edited_obj.build_ui()
# Switch notebook to Selected page
self.ui.notebook.setCurrentWidget(self.ui.selected_tab)
else: else:
if isinstance(edited_obj, FlatCAMGeometry): if isinstance(edited_obj, FlatCAMGeometry):
self.geo_editor.deactivate() self.geo_editor.deactivate()

4
README.md
View File

@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
28.01.2020
- some changes in Excellon Editor
27.01.2020 27.01.2020
- in Geometry Editor made sure that on final save, for MultiLineString geometry all the connected lines are merged into one LineString to minimize the number of vertical movements in GCode - in Geometry Editor made sure that on final save, for MultiLineString geometry all the connected lines are merged into one LineString to minimize the number of vertical movements in GCode

11
flatcamTools/ToolPunchGerber.py
View File

@ -15,17 +15,6 @@ from copy import deepcopy
import logging import logging
from shapely.geometry import Polygon, MultiPolygon, Point from shapely.geometry import Polygon, MultiPolygon, Point
from reportlab.graphics import renderPDF
from reportlab.pdfgen import canvas
from reportlab.graphics import renderPM
from reportlab.lib.units import inch, mm
from reportlab.lib.pagesizes import landscape, portrait
from svglib.svglib import svg2rlg
from xml.dom.minidom import parseString as parse_xml_string
from lxml import etree as ET
from io import StringIO
import gettext import gettext
import FlatCAMTranslation as fcTranslate import FlatCAMTranslation as fcTranslate
import builtins import builtins