diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 6849e678..07d37350 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -94,8 +94,8 @@ class App(QtCore.QObject): log.addHandler(handler) # Version - version = 8.918 - version_date = "2019/06/11" + version = 8.919 + version_date = "2019/06/21" beta = True # current date now diff --git a/README.md b/README.md index 2d4940f3..e465a555 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +15.06.2019 + +- fixed bug in Gerber parser that made the Gerber files generated by Altium Designer 18 not to be loaded + 11.06.2019 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) diff --git a/camlib.py b/camlib.py index 33c80b7d..957aee0e 100644 --- a/camlib.py +++ b/camlib.py @@ -2452,7 +2452,6 @@ class Gerber (Geometry): # --- Buffered --- try: log.debug("Bare op-code %d." % current_operation_code) - geo_dict = dict() flash = self.create_flash_geometry( Point(current_x, current_y), self.apertures[current_aperture], @@ -2467,7 +2466,7 @@ class Gerber (Geometry): else: geo_dict['solid'] = flash - if last_path_aperture not in self.apertures: + if current_aperture not in self.apertures: self.apertures[current_aperture] = dict() if 'geometry' not in self.apertures[current_aperture]: self.apertures[current_aperture]['geometry'] = [] diff --git a/flatcamGUI/GUIElements.py b/flatcamGUI/GUIElements.py index 89a24ace..780c165d 100644 --- a/flatcamGUI/GUIElements.py +++ b/flatcamGUI/GUIElements.py @@ -1059,7 +1059,6 @@ class FCDetachableTab(QtWidgets.QTabWidget): # Re-attach the tab at the given index self.attachTab(contentWidget, name, icon, index) - # If the drop did not occur on an existing tab, determine if the drop # occurred in the tab bar area (the area to the side of the QTabBar) else: @@ -1227,14 +1226,17 @@ class FCDetachableTab(QtWidgets.QTabWidget): :return: """ # Determine if the current movement is detected as a drag - if not self.dragStartPos.isNull() and ((event.pos() - self.dragStartPos).manhattanLength() < QtWidgets.QApplication.startDragDistance()): + if not self.dragStartPos.isNull() and \ + ((event.pos() - self.dragStartPos).manhattanLength() < QtWidgets.QApplication.startDragDistance()): self.dragInitiated = True # If the current movement is a drag initiated by the left button if (((event.buttons() & QtCore.Qt.LeftButton)) and self.dragInitiated): # Stop the move event - finishMoveEvent = QtGui.QMouseEvent(QtCore.QEvent.MouseMove, event.pos(), QtCore.Qt.NoButton, QtCore.Qt.NoButton, QtCore.Qt.NoModifier) + finishMoveEvent = QtGui.QMouseEvent( + QtCore.QEvent.MouseMove, event.pos(), QtCore.Qt.NoButton, QtCore.Qt.NoButton, QtCore.Qt.NoModifier + ) QtWidgets.QTabBar.mouseMoveEvent(self, finishMoveEvent) # Convert the move event into a drag @@ -1261,13 +1263,11 @@ class FCDetachableTab(QtWidgets.QTabWidget): # Initiate the drag dropAction = drag.exec_(QtCore.Qt.MoveAction | QtCore.Qt.CopyAction) - # For Linux: Here, drag.exec_() will not return MoveAction on Linux. So it # must be set manually if self.dragDropedPos.x() != 0 and self.dragDropedPos.y() != 0: dropAction = QtCore.Qt.MoveAction - # If the drag completed outside of the tab bar, detach the tab and move # the content to the current cursor position if dropAction == QtCore.Qt.IgnoreAction: